Merge commit 'v3.3-rc6' into android-3.3
authorColin Cross <ccross@android.com>
Mon, 5 Mar 2012 22:17:12 +0000 (14:17 -0800)
committerColin Cross <ccross@android.com>
Mon, 5 Mar 2012 22:17:12 +0000 (14:17 -0800)
commit91154555190c1d25d02db5240a4cb89d2603c6da
treec86651082158fd88d5c5a71b8fdef36153ece212
parentcd7bc93466877cb1396cbddb4e608252db2a9a3f
parent192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d
Merge commit 'v3.3-rc6' into android-3.3
include/net/bluetooth/hci_core.h
kernel/sched/core.c
net/bluetooth/af_bluetooth.c
net/bluetooth/l2cap_core.c
net/bluetooth/rfcomm/core.c