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)
1  2 
drivers/net/arm/ixp4xx_eth.c

Simple merge