Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ... This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-10-28 09:44:56 -07:00
..
cvmx-address.h
cvmx-asxx-defs.h
cvmx-cmd-queue.c	staging/trivial: fix typos concerning "initiali[zs]e"	2010-06-22 14:58:01 -07:00
cvmx-cmd-queue.h
cvmx-config.h
cvmx-dbg-defs.h
cvmx-fau.h	Staging: fix typos concerning "address"	2010-07-22 14:43:10 -07:00
cvmx-fpa-defs.h
cvmx-fpa.c	staging/trivial: fix typos concerning "access"	2010-09-04 21:23:25 -07:00
cvmx-fpa.h	staging/trivial: fix typos concerning "access"	2010-09-04 21:23:25 -07:00
cvmx-gmxx-defs.h
cvmx-helper-board.c	staging: octeon: Remove USB code	2010-10-14 12:14:09 -07:00
cvmx-helper-board.h	staging: octeon: Remove USB code	2010-10-14 12:14:09 -07:00
cvmx-helper-fpa.c
cvmx-helper-fpa.h
cvmx-helper-loop.c
cvmx-helper-loop.h
cvmx-helper-npi.c
cvmx-helper-npi.h
cvmx-helper-rgmii.c
cvmx-helper-rgmii.h
cvmx-helper-sgmii.c
cvmx-helper-sgmii.h
cvmx-helper-spi.c
cvmx-helper-spi.h
cvmx-helper-util.c
cvmx-helper-util.h
cvmx-helper-xaui.c
cvmx-helper-xaui.h
cvmx-helper.c
cvmx-helper.h
cvmx-interrupt-decodes.c
cvmx-interrupt-rsl.c
cvmx-ipd.h
cvmx-mdio.h
cvmx-packet.h
cvmx-pcsx-defs.h
cvmx-pcsxx-defs.h
cvmx-pip-defs.h
cvmx-pip.h
cvmx-pko-defs.h
cvmx-pko.c
cvmx-pko.h
cvmx-pow.h	Staging: fix assorted typos all over the place	2009-12-11 12:23:20 -08:00
cvmx-scratch.h
cvmx-smix-defs.h
cvmx-spi.c
cvmx-spi.h
cvmx-spxx-defs.h
cvmx-srxx-defs.h
cvmx-stxx-defs.h
cvmx-wqe.h
ethernet-defines.h	Staging: Octeon: Free transmit SKBs in a timely manner	2010-02-27 12:53:30 +01:00
ethernet-mdio.c	net: preserve ifreq parameter when calling generic phy_mii_ioctl().	2010-07-18 19:15:25 -07:00
ethernet-mdio.h	Staging: octeon: remove unneeded includes	2010-02-27 12:53:28 +01:00
ethernet-mem.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ethernet-mem.h
ethernet-rgmii.c	Staging: Octeon: Run phy bus accesses on a workqueue.	2010-02-27 12:53:29 +01:00
ethernet-rx.c	Staging: Octeon: Reformat a bunch of comments.	2010-02-27 12:53:30 +01:00
ethernet-rx.h	Staging: Octeon Ethernet: Convert to NAPI.	2010-02-27 12:53:08 +01:00
ethernet-sgmii.c	Staging: octeon: remove unneeded includes	2010-02-27 12:53:28 +01:00
ethernet-spi.c	staging: octeon: check request_irq() return value	2010-08-02 18:23:44 -07:00
ethernet-tx.c	Staging: Octeon: Reformat a bunch of comments.	2010-02-27 12:53:30 +01: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: Reformat a bunch of comments.	2010-02-27 12:53:30 +01:00
ethernet-xaui.c	Staging: octeon: remove unneeded includes	2010-02-27 12:53:28 +01:00
ethernet.c	staging: octeon: use free_netdev(netdev) instead of kfree()	2010-09-30 04:14:20 -07:00
Kconfig	Staging: octeon: depends on NETDEVICES	2010-09-03 17:37:16 -07:00
Makefile	Staging: octeon: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:47 -07:00
octeon-ethernet.h	Staging: Octeon: Reformat a bunch of comments.	2010-02-27 12:53:30 +01:00