Merge commit 'v3.0-rc6' into android-3.0

diff --cc drivers/net/Kconfig
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc net/bluetooth/hci_conn.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/ipv4/netfilter/ipt_REJECT.c
Simple merge