Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10

diff --combined drivers/staging/android/Kconfig
index 1e1b36ab1389d1d23c0df44013e15434b881fba4,c5539001f4442769bbafcd926b79c3612f51cccd..f07d9f2a06f955759614bfa29cff41cca9f6142b
--- 1/drivers/staging/android/Kconfig
--- 2/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -20,9 -20,9 +20,9 @@@ config ANDROID_BINDER_IP
          between said processes.
  
  config ANDROID_BINDER_IPC_32BIT
 -      bool "Use old 32-bit binder api"
 +      bool
          default y
 -      depends on !64BIT
 +      depends on !64BIT && ANDROID_BINDER_IPC
        ---help---
          Enable to support an old 32-bit Android user-space. Breaks the new
          Android user-space.
@@@ -118,6 -118,8 +118,8 @@@ config SW_SYNC_USE
  
  source "drivers/staging/android/ion/Kconfig"
  
+ source "drivers/staging/android/fiq_debugger/Kconfig"
+ 
  endif # if ANDROID
  
  endmenu