Merge commit 'v3.0.30' into android-3.0

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc include/net/bluetooth/hci.h
Simple merge

diff --cc kernel/futex.c
Simple merge

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

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc security/commoncap.c
index 1322b6aa648d340641adbb609019897f17b14e7d,44f096920cd14d0d5e4aea98546113518ea614e1..ccfe568b396fbfc6f70ae0e09784377843f945d3
--- 1/security/commoncap.c
--- 2/security/commoncap.c
+++ b/security/commoncap.c
@@@ -28,11 -28,8 +28,12 @@@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
  #include <linux/user_namespace.h>
+ #include <linux/personality.h>
  
 +#ifdef CONFIG_ANDROID_PARANOID_NETWORK
 +#include <linux/android_aid.h>
 +#endif
 +
  /*
   * If a non-root user executes a setuid-root binary in
   * !secure(SECURE_NOROOT) mode, then we raise capabilities.