Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging tree changes from Greg Kroah-Hartman:
 "Here is the big staging tree pull request for the 3.5-rc1 merge
  window.

  Loads of changes here, and we just narrowly added more lines than we
  added:
   622 files changed, 28356 insertions(+), 26059 deletions(-)

  But, good news is that there is a number of subsystems that moved out
  of the staging tree, to their respective "real" portions of the
  kernel.

  Code that moved out was:
	- iio core code
	- mei driver
	- vme core and bridge drivers

  There was one broken network driver that moved into staging as a step
  before it is removed from the tree (pc300), and there was a few new
  drivers added to the tree:
	- new iio drivers
	- gdm72xx wimax USB driver
	- ipack subsystem and 2 drivers

  All of the movements around have acks from the various subsystem
  maintainers, and all of this has been in the linux-next tree for a
  while.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up various trivial conflicts, along with a non-trivial one found
in -next and pointed out by Olof Johanssen: a clean - but incorrect -
merge of the arch/arm/boot/dts/at91sam9g20.dtsi file.  Fix up manually
as per Stephen Rothwell.

* tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
  Staging: bcm: Remove two unused variables from Adapter.h
  Staging: bcm: Removes the volatile type definition from Adapter.h
  Staging: bcm: Rename all "INT" to "int" in Adapter.h
  Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
  Staging: bcm: Correctly format all comments in Adapter.h
  Staging: bcm: Fix all whitespace issues in Adapter.h
  Staging: bcm: Properly format braces in Adapter.h
  Staging: ipack/bridges/tpci200: remove unneeded casts
  Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
  Staging: ipack: remove board_name and bus_name fields from struct ipack_device
  Staging: ipack: improve the register of a bus and a device in the bus.
  staging: comedi: cleanup all the comedi_driver 'detach' functions
  staging: comedi: remove all 'default N' in Kconfig
  staging: line6/config.h: Delete unused header
  staging: gdm72xx depends on NET
  staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
  staging: drm/omap: initial dmabuf/prime import support
  staging: drm/omap: dmabuf/prime mmap support
  pstore/ram: Add ECC support
  pstore/ram: Switch to persistent_ram routines
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9g20ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
Simple merge

diff --cc drivers/Kconfig
index 63b81826cb558b6a80d339bccf8f74a3183a619d,e245779443da2a120f42afab2d7f9a438637693d..bfc918633fd9275f856d53e280fae9be2f8ba698
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,8 -140,8 +140,12 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
 +source "drivers/memory/Kconfig"
 +
+ source "drivers/iio/Kconfig"
+ 
+ source "drivers/vme/Kconfig"
+ 
  endmenu

diff --cc drivers/Makefile
index 265b506a15be3cda883258646031baeaf8313542,08b78e035468c1b0cbbcf7e1504d9cbd90a1732e..35d5181c8ef2d876b5c7789e2541380548fba30f
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -134,5 -134,5 +134,7 @@@ obj-$(CONFIG_VIRT_DRIVERS) += virt
  obj-$(CONFIG_HYPERV)          += hv/
  
  obj-$(CONFIG_PM_DEVFREQ)      += devfreq/
 +obj-$(CONFIG_EXTCON)          += extcon/
 +obj-$(CONFIG_MEMORY)          += memory/
+ obj-$(CONFIG_IIO)             += iio/
+ obj-$(CONFIG_VME_BUS)         += vme/

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
index 162861788c6debea92fefc4177ba1085d823c004,0f6af6a13345e0f2ce4c43791e9a26b2574a8cab..456972faaeb3a53475495cc7b14b340069f67b8a
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -50,3 -48,5 +50,4 @@@ obj-y                         += lis3lv02d
  obj-y                         += carma/
  obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
  obj-$(CONFIG_ALTERA_STAPL)    +=altera-stapl/
 -obj-$(CONFIG_MAX8997_MUIC)    += max8997-muic.o
+ obj-$(CONFIG_INTEL_MEI)               += mei/

diff --cc drivers/staging/Kconfig
index 32bd967f4262116e7947ceee15ac4c20387bdfbd,7e0e5e4317a88d09bdc810579289118d54d73cd5..05e33c700750767c3e5455be7dfac45a652acb17
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -130,6 -128,8 +126,10 @@@ source "drivers/staging/ramster/Kconfig
  
  source "drivers/staging/ozwpan/Kconfig"
  
 +source "drivers/staging/ccg/Kconfig"
 +
+ source "drivers/staging/ipack/Kconfig"
+ 
+ source "drivers/staging/gdm72xx/Kconfig"
+ 
  endif # STAGING

diff --cc drivers/staging/Makefile
index eae8a21f46b893394d89de50b59ed47946846b62,30901057bd1af4b73a4f951b12b570ed22021499..a987b3ad380be083ea133ce77db0538cd212f787
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -56,4 -57,4 +56,5 @@@ obj-$(CONFIG_ANDROID)         += android
  obj-$(CONFIG_PHONE)           += telephony/
  obj-$(CONFIG_RAMSTER)         += ramster/
  obj-$(CONFIG_USB_WPAN_HCD)    += ozwpan/
 +obj-$(CONFIG_USB_G_CCG)               += ccg/
+ obj-$(CONFIG_WIMAX_GDM72XX)   += gdm72xx/

diff --cc drivers/staging/android/Kconfig
index c706635f3f8225dc9d5534fdf2f8f0b5952a34b8,63f98223760bcd9ee5272098e8e5c936ce63325b..0e16b594460fb86d81c7813419afe65fd5b125e6
--- 1/drivers/staging/android/Kconfig
--- 2/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -53,7 -45,9 +45,7 @@@ config ANDROID_LOW_MEMORY_KILLE
        ---help---
          Register processes to be killed when memory is low
  
- config ANDROID_INTF_ALARM
 -source "drivers/staging/android/switch/Kconfig"
 -
+ config ANDROID_INTF_ALARM_DEV
        bool "Android alarm driver"
        depends on RTC_CLASS
        default n

diff --cc drivers/staging/android/Makefile
index 045d17bde5243f02ee4356415d402cc7ee1595bc,4677e7b0e07a29e660cee4c2996d197041ac2c60..98711e2b2afa65d48d1b1950529ef605f575e13d
--- 1/drivers/staging/android/Makefile
--- 2/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -6,5 -5,5 +5,4 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)        += ra
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)    += timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)      += timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)       += lowmemorykiller.o
- obj-$(CONFIG_ANDROID_INTF_ALARM)      += alarm.o
 -obj-$(CONFIG_ANDROID_SWITCH)          += switch/
  obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)  += alarm-dev.o

diff --cc drivers/staging/media/as102/as102_usb_drv.c
Simple merge

diff --cc drivers/staging/octeon/ethernet-tx.c
Simple merge

diff --cc drivers/staging/ramster/cluster/tcp.c
Simple merge

diff --cc include/linux/Kbuild
Simple merge