Merge commit 'v3.0-rc6' into android-3.0
authorDima Zavin <dima@android.com>
Fri, 8 Jul 2011 00:55:44 +0000 (17:55 -0700)
committerDima Zavin <dima@android.com>
Fri, 8 Jul 2011 00:55:44 +0000 (17:55 -0700)
commit814cdea670616252e4cdf297a07b02ce59698bf1
treec4a5665995e813c252b07f1e863166059bfb5bcb
parent487ffb052891a552fecf865ad4b24bbe7945a413
parentfe0d42203cb5616eeff68b14576a0f7e2dd56625
Merge commit 'v3.0-rc6' into android-3.0
drivers/net/Kconfig
fs/proc/base.c
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
net/ipv4/netfilter/ipt_REJECT.c