黄涛 ed535bdcad Revert "phonepad: add rda5990 bt\wifi support" ...

This reverts commit 468fa60b79.

Conflicts:

	drivers/mmc/host/rk29_sdmmc.c

2012-09-28 09:53:55 +08:00

..

bnep

Merge commit 'v3.0.8' into android-3.0

2011-10-27 15:01:19 -07:00

cmtp

Bluetooth: Kill set but unused variable 'cmd' in cmtp_recv_capimsg()

2011-07-11 11:59:18 -07:00

hidp

Bluetooth: hidp: Don't release device ref if never held

2011-08-11 18:42:58 -07:00

rfcomm

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

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

af_bluetooth.c

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

hci_conn.c

Bluetooth: Fix l2cap conn failures for ssp devices

2012-04-13 08:14:08 -07:00

hci_core.c

Revert "phonepad: add rda5990 bt\wifi support"

2012-09-28 09:53:55 +08:00

hci_event.c

Bluetooth: Keep master role when SCO or eSCO is active

2011-11-28 15:34:39 -08:00

hci_sock.c

Bluetooth: Move blacklisting functions to hci_core

2011-07-11 11:59:23 -07:00

hci_sysfs.c

Bluetooth: Add variable SSP auto-accept delay support

2011-04-28 16:02:30 -03:00

Kconfig

Bluetooth: uses crypto interfaces, select CRYPTO

2011-07-11 11:59:25 -07:00

l2cap_core.c

Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acks

2011-08-02 15:11:15 -07:00

l2cap_sock.c

Bluetooth: Fixed wrong L2CAP Sock timer value

2011-08-09 11:04:34 -07:00

lib.c

Bluetooth: Add bt_printk

2011-07-11 11:59:26 -07:00

Makefile

Bluetooth: Implement the first SMP commands

2011-07-11 11:59:20 -07:00

mgmt.c

Bluetooth: Add support for storing the key size

2011-07-11 11:59:36 -07:00

sco.c

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

smp.c

Bluetooth: Add support for storing the key size

2011-07-11 11:59:36 -07:00