renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code
ff4b8a57f0
linux-next/drivers/bluetooth
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
ath3k.c USB: convert drivers/bluetooth/* to use module_usb_driver() 2011-11-18 09:47:34 -08:00
bcm203x.c USB: convert drivers/bluetooth/* to use module_usb_driver() 2011-11-18 09:47:34 -08:00
bfusb.c USB: convert drivers/bluetooth/* to use module_usb_driver() 2011-11-18 09:47:34 -08:00
bluecard_cs.c pcmcia: Convert pcmcia_device_id declarations to const 2011-05-06 07:46:22 +02:00
bpa10x.c USB: convert drivers/bluetooth/* to use module_usb_driver() 2011-11-18 09:47:34 -08:00
bt3c_cs.c pcmcia: Convert pcmcia_device_id declarations to const 2011-05-06 07:46:22 +02:00
btmrvl_debugfs.c Bluetooth: Do not ignore errors returned from strict_strtol() 2011-06-10 15:04:41 -03:00
btmrvl_drv.h Bluetooth: Use __packed annotation for drivers 2010-07-21 10:39:13 -07:00
btmrvl_main.c bluetooth: add module.h to drivers/bluetooth files as required. 2011-10-31 19:31:26 -04:00
btmrvl_sdio.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem 2011-12-09 14:07:12 -05:00
btmrvl_sdio.h Bluetooth: btmrvl: support Marvell Bluetooth device SD8787 2011-04-13 12:20:05 -03:00
btsdio.c Bluetooth: Support SDIO devices that are AMP controllers 2010-10-12 12:44:51 -03:00
btuart_cs.c pcmcia: Convert pcmcia_device_id declarations to const 2011-05-06 07:46:22 +02:00
btusb.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
btwilink.c bluetooth: add module.h to drivers/bluetooth files as required. 2011-10-31 19:31:26 -04:00
dtl1_cs.c pcmcia: Convert pcmcia_device_id declarations to const 2011-05-06 07:46:22 +02:00
hci_ath.c Bluetooth: hci_uart: check the return value of recv() 2011-04-13 12:20:03 -03: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: Check return value of hci_recv_stream_fragment() 2011-04-13 12:20:04 -03:00
hci_ldisc.c Revert "tty: make receive_buf() return the amout of bytes received" 2011-06-04 06:33:24 +09:00
hci_ll.c Fix common misspellings 2011-03-31 11:26:23 -03: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: btmrvl: support Marvell Bluetooth device SD8797 2011-11-21 13:52:31 -02:00
Makefile Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00