renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 22:53:55 +08:00
Code
a210576cf8
linux-next/drivers/net/ethernet/intel/e1000e
History
David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-01 13:36:50 -04:00
..
80003es2lan.c e1000e: cleanup USLEEP_RANGE checkpatch checks 2013-03-08 01:28:59 -08:00
80003es2lan.h e1000e: cosmetic move of #defines to the new 80003es2lan.h 2013-02-04 23:32:20 -08:00
82571.c e1000e: cleanup USLEEP_RANGE checkpatch checks 2013-03-08 01:28:59 -08:00
82571.h e1000e: cleanup - move defines to appropriate header file 2013-03-08 01:53:29 -08:00
defines.h e1000e: slow performance between two 82579 connected via 10Mbit hub 2013-03-27 23:25:36 -07:00
e1000.h e1000e: EEE capability advertisement not set/disabled as required 2013-03-28 00:01:52 -07:00
ethtool.c e1000e: EEE capability advertisement not set/disabled as required 2013-03-28 00:01:52 -07:00
hw.h e1000e: cleanup SPACING checkpatch errors and warnings 2013-03-08 00:23:56 -08:00
ich8lan.c e1000e: add support for LTR on I217/I218 2013-03-28 00:25:11 -07:00
ich8lan.h e1000e: cleanup unused defines 2013-03-28 00:37:08 -07:00
mac.c e1000e: fix LED blink logic for designs with LEDs driven by cathode 2013-03-27 23:32:06 -07:00
mac.h e1000e: cosmetic move of function prototypes to the new mac.h 2013-02-04 23:52:44 -08:00
Makefile e1000e: update copyright date 2013-01-27 01:22:53 -08:00
manage.c e1000e: cosmetic move of #defines and prototypes to the new manage.h 2013-02-05 00:12:27 -08:00
manage.h e1000e: cosmetic move of #defines and prototypes to the new manage.h 2013-02-05 00:12:27 -08:00
netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-01 13:36:50 -04:00
nvm.c e1000e: cleanup USLEEP_RANGE checkpatch checks 2013-03-08 01:28:59 -08:00
nvm.h e1000e: cosmetic move of #defines and function prototypes to the new nvm.h 2013-02-05 00:05:41 -08:00
param.c e1000e: cleanup format of struct e1000_opt_list struct 2013-03-08 01:35:16 -08:00
phy.c e1000e: fix scheduling while atomic bugs 2013-03-28 00:56:48 -07:00
phy.h e1000e: cosmetic move of #defines and function prototypes to the new phy.h 2013-02-04 23:59:16 -08:00
ptp.c e1000e: resolve -Wunused-parameter compile warnings 2013-01-31 22:28:39 -08:00
regs.h e1000e: workaround DMA unit hang on I218 2013-03-05 01:01:43 -08:00