android_kernel_samsung_msm8976/drivers/bluetooth
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
ath3k.c Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 2011-02-18 17:03:41 -05:00
bcm203x.c
bfusb.c
bluecard_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
bpa10x.c Bluetooth: Use __packed annotation for drivers 2010-07-21 10:39:13 -07:00
bt3c_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
btmrvl_debugfs.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
btmrvl_drv.h Bluetooth: Use __packed annotation for drivers 2010-07-21 10:39:13 -07:00
btmrvl_main.c Bluetooth: HCI devices are either BR/EDR or AMP radios 2010-10-12 12:44:51 -03:00
btmrvl_sdio.c
btmrvl_sdio.h
btsdio.c Bluetooth: Support SDIO devices that are AMP controllers 2010-10-12 12:44:51 -03:00
btuart_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
btusb.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-03-18 10:37:40 -07:00
btwilink.c Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00
dtl1_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
hci_ath.c hci_ath: Fix the mess in this driver 2011-02-17 12:03:53 -08:00
hci_bcsp.c Bluetooth: Add __init and __exit marks to UART drivers 2010-07-27 12:35:58 -07:00
hci_h4.c Bluetooth: Add __init and __exit marks to UART drivers 2010-07-27 12:35:58 -07:00
hci_ldisc.c Bluetooth: Make hci a child of the corresponding tty device. 2011-02-16 16:33:25 -03:00
hci_ll.c Bluetooth: Add __init and __exit marks to UART drivers 2010-07-27 12:35:58 -07:00
hci_uart.h Bluetooth: Support for Atheros AR300x serial chip 2010-07-21 10:39:14 -07:00
hci_vhci.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
Kconfig Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00
Makefile Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00