Merge commit 'v3.0.30' into android-3.0
authorTodd Poynor <toddpoynor@google.com>
Mon, 30 Apr 2012 22:36:56 +0000 (15:36 -0700)
committerTodd Poynor <toddpoynor@google.com>
Mon, 30 Apr 2012 22:36:56 +0000 (15:36 -0700)
commit5c15664a86e18352ccdc2f501907725caa9ab73d
treef8289ea774881961a44d904a3f41f4c17b8facf3
parent80b8354d535d2e8d6ced0b0e129257dba1fb2130
parentf1c84a5cb52ee2915457b481c756fcc1dfe6a471
Merge commit 'v3.0.30' into android-3.0
drivers/usb/gadget/Kconfig
include/net/bluetooth/hci.h
kernel/futex.c
net/bluetooth/hci_core.c
net/ipv4/tcp.c
security/commoncap.c