linux/drivers/staging
Linus Torvalds fb09bafda6 Staging tree pull request for 3.5-rc1
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
  ...
2012-05-22 16:34:21 -07:00
..
android Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
asus_oled staging: asus_oled.c: remove err() usage 2012-04-23 16:45:54 -07:00
bcm Staging: bcm: Remove two unused variables from Adapter.h 2012-05-18 17:41:16 -07:00
ccg staging: usb: gadget: Add FunctionFS support to Configurable Composite Gadget driver 2012-05-16 05:32:20 -07:00
comedi staging: comedi: cleanup all the comedi_driver 'detach' functions 2012-05-18 17:29:55 -07:00
cptm1217
crystalhd
cxt1e1
echo
et131x staging: et131x: Fix coding style issues 2012-05-01 21:48:44 -07:00
frontier staging: frontier: alphatrack.c: remove err() usage 2012-04-23 16:46:11 -07:00
ft1000
gdm72xx staging: gdm72xx depends on NET 2012-05-17 13:17:41 -07:00
iio staging: iio: add support for hmc5883/hmc5883l to hmc5843 magnetometer driver 2012-05-17 08:24:56 -07:00
ipack Staging: ipack/bridges/tpci200: remove unneeded casts 2012-05-18 17:38:17 -07:00
keucr
line6 staging: line6/config.h: Delete unused header 2012-05-18 17:13:52 -07:00
media Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
net
nvec
octeon Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
olpc_dcon staging: olpc_dcon.c: Remove a few spaces between casts and variables 2012-04-24 11:33:22 -07:00
omapdrm staging: drm/omap: initial dmabuf/prime import support 2012-05-17 08:54:09 -07:00
ozwpan Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
panel
phison
quickstart
ramster Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
rtl8187se staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8192e staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8192u staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8712 staging: rtl8712: Fix typo in rtl871x_io.h 2012-05-15 17:58:30 -07:00
rts5139 staging: "rts5139" Fix typos. 2012-05-14 13:31:09 -07:00
rts_pstor Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
sbe-2t3e3
sep Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
serqt_usb2 USB: serqt_usb2: remove duplicate device ids 2012-05-10 14:13:17 -07:00
slicoss
sm7xx staging: sm7xx: rename function 2012-04-29 21:32:20 -04:00
speakup
ste_rmi4
telephony
tidspbridge Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
usbip Revert "usb: move struct usb_device->children to struct usb_hub_port->child" 2012-05-14 09:20:37 -07:00
vme Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
vt6655 Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
vt6656 staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
winbond
wlags49_h2 Staging: wlags49_h2: potential NULL dereference 2012-05-14 15:43:44 -07:00
wlags49_h25
wlan-ng staging: wlan-ng: Release struct returned by cfg80211_inform_bss to avoid potential memory leak. 2012-04-24 11:28:25 -07:00
xgifb Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
zcache staging: zcache: fix Kconfig crypto dependency 2012-04-24 11:57:36 -07:00
zram
zsmalloc staging: zsmalloc: add/fix function comment 2012-05-09 13:20:22 -07:00
Kconfig Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
Makefile Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
staging.c