黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ... Conflicts: drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/libertas/if_sdio1.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c		2010-12-16 20:54:24 +08:00
..
bcm203x.c
bfusb.c	Bluetooth: Remove some pointless conditionals before kfree_skb()	2009-02-27 06:14:50 +01:00
bluecard_cs.c
bpa10x.c
bt3c_cs.c	Bluetooth: Eliminate a sparse warning in bt3c driver	2009-02-27 06:14:35 +01:00
btmrvl_debugfs.c	Bluetooth: Remove pointless casts from Marvell debugfs support	2009-08-22 14:25:33 -07:00
btmrvl_drv.h	Bluetooth: Remove private device name of Marvell SDIO driver	2009-08-22 14:25:34 -07:00
btmrvl_main.c	Bluetooth: Remove Enter/Leave debug statements from Marvell driver	2009-08-22 14:25:34 -07:00
btmrvl_sdio.c	Bluetooth: Add missing kmalloc NULL tests to Marvell driver	2009-08-22 14:33:22 -07:00
btmrvl_sdio.h	Bluetooth: Fix incorrect alignment in Marvell BT-over-SDIO driver	2009-08-22 14:25:34 -07:00
btsdio.c
btuart_cs.c
btusb.c	Bluetooth: Added support for controller shipped with iMac i5	2010-08-13 13:19:47 -07:00
dtl1_cs.c	pcmcia: dtl1_cs: fix pcmcia_loop_config logic	2009-09-15 10:17:16 -07:00
hci_bcsp.c	Bluetooth: Fix false errors from bcsp_pkt_cull function	2009-08-24 13:32:32 -07:00
hci_h4.c	add bcm432x drivers	2010-08-09 10:57:41 +08:00
hci_ldisc.c	Merge remote branch 'linux-2.6.32.y/master' into develop	2010-12-16 20:54:24 +08:00
hci_ll.c	Bluetooth: Remove some pointless conditionals before kfree_skb()	2009-02-27 06:14:50 +01:00
hci_uart.h
hci_vhci.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
Kconfig	add bcm432x drivers	2010-08-09 10:57:41 +08:00
Makefile	drivers:bluetooth: remove the file bcm4325.c	2010-09-02 16:10:49 +08:00
vflash.c	add bcm432x drivers	2010-08-09 10:57:41 +08:00