Merge branch 'ipg-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes

This commit is contained in:
Jeff Garzik 2008-01-18 14:39:26 -05:00
commit 220df5c3de