Merge branch 'for-david' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
David S. Miller [Fri, 26 Dec 2008 02:10:12 +0000 (18:10 -0800)]
1  2 
drivers/net/arm/ixp4xx_eth.c

Simple merge