summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-08-08 15:41:04 -0700
committerDavid S. Miller <davem@davemloft.net>2012-08-08 15:41:04 -0700
commitb9ad2baf91426787bf52dc06f53b0e81553d1c7d (patch)
treede736d2012d962d21d28f0fef3ed9a5e7697ee58 /net
parent920d087e44c228be6270e07fdb59043380a4bb00 (diff)
parent119b0e0351bcdb7833f368781e6241ff283b49e5 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net
Peter P Waskiewicz Jr says: ==================== This series contains fixes to the e1000e and igb drivers. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions