Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Mon, 7 Mar 2011 23:39:24 +0000 (15:39 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Mar 2011 23:39:24 +0000 (15:39 -0800)
commitef28a4e6ecb8fbe742ea51fc9ec836b5289d1301
tree32b1ace24f341cbf0c25cfb66f506be398a43683
parente3f48d37cf87a4a94e9f05fddc39b0e5f2307c27
parent7a8fc77b3744e26ce1249d9ccb23e356d6010679
Merge branch 'davem-next.r8169' of git://git./linux/kernel/git/romieu/netdev-2.6
drivers/net/Kconfig
drivers/net/r8169.c