Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ... This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-05-02 11:48:07 -07: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
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	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
ethernet-tx.h
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
Kconfig
Makefile	MIPS: Octeon: Move some Ethernet support files out of staging.	2011-12-07 22:03:28 +00:00
octeon-ethernet.h