David S. Miller 56845d78ce Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/atheros/atlx/atl1.c
	drivers/net/ethernet/atheros/atlx/atl1.h

Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-04-15 13:19:04 -04:00

..

80003es2lan.c

e1000e: cleanup boolean logic

2012-04-14 02:05:00 -07:00

82571.c

e1000e: cleanup boolean logic

2012-04-14 02:05:00 -07:00

defines.h

e1000e: Support RXALL feature flag.

2012-02-24 01:44:50 -08:00

e1000.h

e1000e: prevent oops when adapter is being closed and reset simultaneously

2012-04-03 15:25:08 -07:00

ethtool.c

e1000e: cleanup remaining strings split across multiple lines

2012-04-14 02:04:02 -07:00

hw.h

e1000e: cleanup indexed register arrays

2012-04-04 00:24:42 -07:00

ich8lan.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-04-15 13:19:04 -04:00

mac.c

e1000e: cleanup boolean logic

2012-04-14 02:05:00 -07:00

Makefile

e1000e: update copyright year

2012-01-26 19:01:17 -08:00

manage.c

e1000e: cleanup boolean logic

2012-04-14 02:05:00 -07:00

netdev.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-04-10 14:30:45 -04:00

nvm.c

e1000e: rename e1000e_reload_nvm() and call as function pointer

2012-02-24 21:43:21 -08:00

param.c

e1000e: cleanup remaining strings split across multiple lines

2012-04-14 02:04:02 -07:00

phy.c

e1000e: cleanup boolean logic

2012-04-14 02:05:00 -07:00