Merge git://github.com/Jkirsher/net-next
commitfb7a6d4e7da219f895d156cad00e2b6373e2494f
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2011 17:56:44 +0000 (23 13:56 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2011 17:56:44 +0000 (23 13:56 -0400)
tree79f5f36386124f010533b67f0414c4bf86527770
parent230dec61313dc5f5720311d0b492f69f5466b0a4
parent8c838d7384c6e5c0583ec6bbb2e6f6dba19feda1
Merge git://github.com/Jkirsher/net-next
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
include/linux/pci.h