linux-sg2042/drivers/staging/octeon
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
..
Kconfig Staging: octeon: depends on NETDEVICES 2010-09-03 17:37:16 -07:00
Makefile MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-defines.h MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-mdio.c staging/octeon: Fix PHY binding in octeon-ethernet driver. 2012-02-24 12:03:15 -08:00
ethernet-mdio.h Staging: octeon: remove unneeded includes 2010-02-27 12:53:28 +01:00
ethernet-mem.c MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-mem.h
ethernet-rgmii.c MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-rx.c Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
ethernet-rx.h MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-sgmii.c MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-spi.c MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-tx.c Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
ethernet-tx.h Staging: Octeon: Free transmit SKBs in a timely manner 2010-02-27 12:53:30 +01:00
ethernet-util.h staging:octeon Fix typos in staging:octeon 2012-04-10 09:47:05 -07:00
ethernet-xaui.c MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet.c Merge 3.4-rc5 into staging-next 2012-05-02 11:48:07 -07:00
octeon-ethernet.h Staging: Octeon: Reformat a bunch of comments. 2010-02-27 12:53:30 +01:00