linux_dsm_epyc7002/drivers/net/wan
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
..
lmc net: Fix spelling typo in net 2012-04-14 15:29:02 -04:00
.gitignore
c101.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
cosa.c cosa: Update to current logging forms 2011-06-27 00:09:46 -07:00
cosa.h
cycx_drv.c cyclom: Update to current logging forms 2011-06-27 00:09:46 -07:00
cycx_main.c cyclom: Update to current logging forms 2011-06-27 00:09:46 -07:00
cycx_x25.c cyclom: Update to current logging forms 2011-06-27 00:09:46 -07:00
dlci.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
dscc4.c net/wan: use module_pci_driver 2012-04-14 15:20:04 -04:00
farsync.c drivers/net/wan/farsync.c: add missing iounmap 2012-04-17 22:31:59 -04:00
farsync.h
hd64570.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hd64570.h
hd64572.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hd64572.h
hdlc_cisco.c generic_hdlc: Update to current logging forms 2011-06-27 00:09:46 -07:00
hdlc_fr.c net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
hdlc_ppp.c net/wan/hdlc_ppp: use break in switch 2011-08-22 11:30:38 -07:00
hdlc_raw_eth.c net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
hdlc_raw.c
hdlc_x25.c wan: make LAPB callbacks const 2011-09-16 19:20:20 -04:00
hdlc.c generic_hdlc: Update to current logging forms 2011-06-27 00:09:46 -07:00
hostess_sv11.c wan: Update to current logging forms 2011-06-27 00:09:47 -07:00
ixp4xx_hss.c ixp4xx_hss: Update to current logging forms 2011-06-27 00:09:47 -07:00
Kconfig NET: pc300, move to staging as it is broken 2012-04-13 10:57:04 -07:00
lapbether.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
Makefile NET: pc300, move to staging as it is broken 2012-04-13 10:57:04 -07:00
n2.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
pc300too.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
pci200syn.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
sbni.c module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
sbni.h
sdla.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
sealevel.c module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
wanxl.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
wanxl.h
wanxlfw.inc_shipped
wanxlfw.S
x25_asy.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
x25_asy.h
z85230.c wan: Update to current logging forms 2011-06-27 00:09:47 -07:00
z85230.h