Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)
commitfcb118491bc8bc16c4eeb8142366bcbe17fe615d
tree8eb8aba6fe58519aea313820bb4b9c0859721cbd
parent80f0fd8a7f18af78dd26bf94230e89c3ae82d4ba
parentdd1fe113e7532c7513ff03f832312d81628a23ff
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next
drivers/net/ethernet/intel/e1000e/netdev.c