黄涛 21158e22d9 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Conflicts:
	Makefile
	drivers/mmc/core/sd.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2400pci.h
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2500usb.h
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt61pci.h
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/net/wireless/rt2x00/rt73usb.h
	drivers/net/wireless/rtl818x/rtl8187/dev.c
	drivers/usb/serial/option.c
	kernel/time/timekeeping.c

2012-10-08 10:28:29 +08:00

..

ath3k.c

Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C

2012-06-10 00:33:01 +09:00

bcm203x.c

Bluetooth: Use kmemdup for drivers

2010-07-21 10:39:06 -07:00

bfusb.c

Bluetooth: Convert controller hdev->type to hdev->bus

2010-02-27 14:05:38 +01:00

bluecard_cs.c

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

bpa10x.c

Bluetooth: Use __packed annotation for drivers

2010-07-21 10:39:13 -07: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: HCI devices are either BR/EDR or AMP radios

2010-10-12 12:44:51 -03:00

btmrvl_sdio.c

Bluetooth: btmrvl: support Marvell Bluetooth device SD8787

2011-04-13 12:20:05 -03: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

Bluetooth: Add support for Apple vendor-specific devices

2012-10-02 09:47:41 -07:00

btwilink.c

Bluetooth: btwilink driver

2011-02-23 14:39:10 -08: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

Enable bluetooth auto sleep function

2012-05-22 23:12:33 +08:00

hci_ldisc.c

Revert "phonepad: add rda5990 bt\wifi support"

2012-09-28 09:53:55 +08: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

BT: for NH660

2012-08-06 15:19:18 +08:00

Makefile

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +08:00

vflash.c

bluetooth: vflash: fix warning: initialization from incompatible pointer type

2011-11-07 14:36:09 +08:00