]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Thu, 14 Aug 2008 21:50:46 +0000 (14:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Aug 2008 21:50:46 +0000 (14:50 -0700)
commitb793b3a75e12ae4576f3d9b6013c8a7d8b0277b8
treee493685833f06462afd5d4edc6e231c33131a633
parentb635acec48bcaa9183fcbf4e3955616b0d4119b5
parentc0912585ec8b64d846d56995241f2c8a7f48ee75
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
drivers/net/arm/ixp4xx_eth.c