This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.

David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04: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	staging: octeon-ethernet: fix build errors by including interrupt.h	2012-04-24 11:57:37 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04: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: use printk_ratelimited instead of printk_ratelimit	2011-06-28 14:29:19 -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	staging: octeon-ethernet: fix build errors by including interrupt.h	2012-04-24 11:57:37 -07:00
octeon-ethernet.h	Staging: Octeon: Reformat a bunch of comments.	2010-02-27 12:53:30 +01:00