Merge commit 'v3.3-rc6' into android-3.3
Colin Cross [Mon, 5 Mar 2012 22:17:12 +0000 (14:17 -0800)]
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge