q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/ethernet/ti
History
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 netdev: driver: ethernet: Add TI CPSW driver 2012-03-19 18:02:05 -04:00
Makefile netdev: driver: ethernet: Add TI CPSW driver 2012-03-19 18:02:05 -04:00
cpmac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-19 16:03:15 -05:00
cpsw.c cpsw: Hook up default ndo_change_mtu. 2012-03-20 00:33:59 -04:00
cpsw_ale.c netdev: driver: ethernet: add cpsw address lookup engine support 2012-03-19 18:02:05 -04:00
cpsw_ale.h netdev: driver: ethernet: add cpsw address lookup engine support 2012-03-19 18:02:05 -04:00
davinci_cpdma.c davinci_cpdma: export symbols used by other drivers 2012-04-21 15:28:47 -04:00
davinci_cpdma.h
…
davinci_emac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-05-07 23:35:40 -04:00
davinci_mdio.c davinci_mdio: Fix MDIO timeout check 2012-04-17 22:31:59 -04:00
tlan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-05-07 23:35:40 -04:00
tlan.h
…