linux/drivers/bluetooth
David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-06 15:01:18 +00:00
..
bcm203x.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
bfusb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
bluecard_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
bpa10x.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
bt3c_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
btuart_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
dtl1_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
hci_bcsp.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
hci_h4.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
hci_ldisc.c [Bluetooth] Code cleanup for the HCI UART driver 2006-09-28 18:01:30 -07:00
hci_uart.h [Bluetooth] Cleanup of the HCI UART driver 2005-10-28 19:20:45 +02:00
hci_usb.c [Bluetooth] Add support for newer ANYCOM USB dongles 2006-10-20 01:15:03 -07:00
hci_usb.h [Bluetooth] Correct SCO buffer size on request 2006-07-03 19:53:56 -07:00
hci_vhci.c [Bluetooth] Add HCI device identifier for SDIO cards 2006-09-28 18:01:28 -07:00
Kconfig [Bluetooth] Remove TXCRC compile option for BCSP driver 2005-10-28 19:20:40 +02:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00