mirror of
https://github.com/torvalds/linux
synced 2024-10-23 11:46:42 +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 ... |
||
|---|---|---|
| .. | ||
| testcases | ||
| am3517_mt_ventoux.dts | ||
| at91sam9g20.dtsi | ||
| at91sam9g20ek.dts | ||
| at91sam9g20ek_2mmc.dts | ||
| at91sam9g20ek_common.dtsi | ||
| at91sam9g25ek.dts | ||
| at91sam9g45.dtsi | ||
| at91sam9m10g45ek.dts | ||
| at91sam9n12.dtsi | ||
| at91sam9n12ek.dts | ||
| at91sam9x5.dtsi | ||
| at91sam9x5cm.dtsi | ||
| at91sam9260.dtsi | ||
| at91sam9263.dtsi | ||
| at91sam9263ek.dts | ||
| db8500.dtsi | ||
| emev2-kzm9d.dts | ||
| emev2.dtsi | ||
| ethernut5.dts | ||
| exynos4210-origen.dts | ||
| exynos4210-smdkv310.dts | ||
| exynos4210.dtsi | ||
| exynos5250-smdk5250.dts | ||
| exynos5250.dtsi | ||
| highbank.dts | ||
| imx6q-arm2.dts | ||
| imx6q-sabrelite.dts | ||
| imx6q.dtsi | ||
| imx27-phytec-phycore.dts | ||
| imx27.dtsi | ||
| imx51-babbage.dts | ||
| imx51.dtsi | ||
| imx53-ard.dts | ||
| imx53-evk.dts | ||
| imx53-qsb.dts | ||
| imx53-smd.dts | ||
| imx53.dtsi | ||
| kirkwood-dns320.dts | ||
| kirkwood-dns325.dts | ||
| kirkwood-dreamplug.dts | ||
| kirkwood-ib62x0.dts | ||
| kirkwood-iconnect.dts | ||
| kirkwood.dtsi | ||
| kizbox.dts | ||
| lpc32xx.dtsi | ||
| mmp2-brownstone.dts | ||
| mmp2.dtsi | ||
| msm8660-surf.dts | ||
| omap2.dtsi | ||
| omap3-beagle.dts | ||
| omap3-evm.dts | ||
| omap3.dtsi | ||
| omap4-panda.dts | ||
| omap4-sdp.dts | ||
| omap4.dtsi | ||
| phy3250.dts | ||
| picoxcell-pc3x2.dtsi | ||
| picoxcell-pc3x3.dtsi | ||
| picoxcell-pc7302-pc3x2.dts | ||
| picoxcell-pc7302-pc3x3.dts | ||
| prima2-cb.dts | ||
| pxa168-aspenite.dts | ||
| pxa168.dtsi | ||
| pxa910-dkb.dts | ||
| pxa910.dtsi | ||
| r8a7740-armadillo800eva.dts | ||
| sh73a0-kzm9g.dts | ||
| sh7372.dtsi | ||
| skeleton.dtsi | ||
| snowball.dts | ||
| spear3xx.dtsi | ||
| spear300-evb.dts | ||
| spear300.dtsi | ||
| spear310-evb.dts | ||
| spear310.dtsi | ||
| spear320-evb.dts | ||
| spear320.dtsi | ||
| spear600-evb.dts | ||
| spear600.dtsi | ||
| tegra-cardhu.dts | ||
| tegra-harmony.dts | ||
| tegra-paz00.dts | ||
| tegra-seaboard.dts | ||
| tegra-trimslice.dts | ||
| tegra-ventana.dts | ||
| tegra20.dtsi | ||
| tegra30.dtsi | ||
| tny_a9g20.dts | ||
| tny_a9260.dts | ||
| tny_a9260_common.dtsi | ||
| tny_a9263.dts | ||
| twl4030.dtsi | ||
| twl6030.dtsi | ||
| usb_a9g20-dab-mmx.dtsi | ||
| usb_a9g20.dts | ||
| usb_a9260.dts | ||
| usb_a9260_common.dtsi | ||
| usb_a9263.dts | ||
| versatile-ab.dts | ||
| versatile-pb.dts | ||
| vexpress-v2m-rs1.dtsi | ||
| vexpress-v2m.dtsi | ||
| vexpress-v2p-ca5s.dts | ||
| vexpress-v2p-ca9.dts | ||
| vexpress-v2p-ca15-tc1.dts | ||
| zynq-ep107.dts | ||