mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 03:11:46 +00:00
fb09bafda6
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> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk+7q8MACgkQMUfUDdst+ymjogCguo8fANFVlPWeZGeoBTL+aQfQ yTkAoLE0codmh+2SvhulYgyU1Wh6ZDK2 =nJ2F -----END PGP SIGNATURE----- Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/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 <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 ...
61 lines
2.0 KiB
Makefile
61 lines
2.0 KiB
Makefile
# Makefile for staging directory
|
|
|
|
# fix for build system bug...
|
|
obj-$(CONFIG_STAGING) += staging.o
|
|
|
|
obj-y += media/
|
|
obj-y += net/
|
|
obj-$(CONFIG_ET131X) += et131x/
|
|
obj-$(CONFIG_SLICOSS) += slicoss/
|
|
obj-$(CONFIG_USBIP_CORE) += usbip/
|
|
obj-$(CONFIG_W35UND) += winbond/
|
|
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
|
|
obj-$(CONFIG_ECHO) += echo/
|
|
obj-$(CONFIG_COMEDI) += comedi/
|
|
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
|
|
obj-$(CONFIG_ASUS_OLED) += asus_oled/
|
|
obj-$(CONFIG_PANEL) += panel/
|
|
obj-$(CONFIG_R8187SE) += rtl8187se/
|
|
obj-$(CONFIG_RTL8192U) += rtl8192u/
|
|
obj-$(CONFIG_RTL8192E) += rtl8192e/
|
|
obj-$(CONFIG_R8712U) += rtl8712/
|
|
obj-$(CONFIG_RTS_PSTOR) += rts_pstor/
|
|
obj-$(CONFIG_RTS5139) += rts5139/
|
|
obj-$(CONFIG_TRANZPORT) += frontier/
|
|
obj-$(CONFIG_IDE_PHISON) += phison/
|
|
obj-$(CONFIG_LINE6_USB) += line6/
|
|
obj-$(CONFIG_USB_SERIAL_QUATECH2) += serqt_usb2/
|
|
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
|
|
obj-$(CONFIG_VT6655) += vt6655/
|
|
obj-$(CONFIG_VT6656) += vt6656/
|
|
obj-$(CONFIG_VME_BUS) += vme/
|
|
obj-$(CONFIG_IPACK_BUS) += ipack/
|
|
obj-$(CONFIG_DX_SEP) += sep/
|
|
obj-$(CONFIG_IIO) += iio/
|
|
obj-$(CONFIG_ZRAM) += zram/
|
|
obj-$(CONFIG_ZCACHE) += zcache/
|
|
obj-$(CONFIG_ZSMALLOC) += zsmalloc/
|
|
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
|
|
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
|
|
obj-$(CONFIG_FB_SM7XX) += sm7xx/
|
|
obj-$(CONFIG_CRYSTALHD) += crystalhd/
|
|
obj-$(CONFIG_CXT1E1) += cxt1e1/
|
|
obj-$(CONFIG_FB_XGI) += xgifb/
|
|
obj-$(CONFIG_TIDSPBRIDGE) += tidspbridge/
|
|
obj-$(CONFIG_ACPI_QUICKSTART) += quickstart/
|
|
obj-$(CONFIG_SBE_2T3E3) += sbe-2t3e3/
|
|
obj-$(CONFIG_USB_ENESTORAGE) += keucr/
|
|
obj-$(CONFIG_BCM_WIMAX) += bcm/
|
|
obj-$(CONFIG_FT1000) += ft1000/
|
|
obj-$(CONFIG_SPEAKUP) += speakup/
|
|
obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217) += cptm1217/
|
|
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/
|
|
obj-$(CONFIG_MFD_NVEC) += nvec/
|
|
obj-$(CONFIG_DRM_OMAP) += omapdrm/
|
|
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/
|