Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...
authorJeff Garzik <jeff@garzik.org>
Mon, 11 Feb 2008 16:07:34 +0000 (11:07 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 11 Feb 2008 16:07:34 +0000 (11:07 -0500)
commit6585b4a71f523485ecf33e7f4569be4095d63699
tree6f52233199b5d63cf74dcd308842681ab91cb88a
parent179c743ff11b7ef3c0df4748b28c761a5fe19b11
parentec6d2d453a932fd50c5fd95d5aac633b4e5f241d
Merge branch 'r6040' of git://git./linux/kernel/git/romieu/netdev-2.6 into upstream-fixes