From: Linus Torvalds Date: Tue, 22 May 2012 23:34:21 +0000 (-0700) Subject: Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... X-Git-Tag: v3.5-rc1~145 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb09bafda67041b74a668dc9d77735e36bd33d3b;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge tag 'staging-3.5-rc1' of git://git./linux/kernel/git/gregkh/staging 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 " 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 ... --- fb09bafda67041b74a668dc9d77735e36bd33d3b diff --cc drivers/Kconfig index 63b8182,e245779..bfc9186 --- a/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 265b506,08b78e0..35d5181 --- a/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/Makefile index 1628617,0f6af6a..456972f --- a/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 32bd967,7e0e5e4..05e33c7 --- a/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 eae8a21,3090105..a987b3a --- a/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 c706635,63f9822..0e16b59 --- a/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 045d17b,4677e7b..98711e2 --- a/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