Merge branch 'netdev-2.6.20' of master.kernel.org:/pub/scm/linux/kernel/git/viro...
authorJeff Garzik <jeff@garzik.org>
Mon, 4 Dec 2006 23:27:43 +0000 (18:27 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 4 Dec 2006 23:27:43 +0000 (18:27 -0500)
commit2ad657c88d8b3c1f97c1b8cc474b6307ba7f8509
tree8b2aafc89feaffe5e726cf38f4110a638a776cc7
parentff51a98799931256b555446b2f5675db08de6229
parentc69fda4e181fe448c43c2e1cc7b3fa67263d88ca
Merge branch 'netdev-2.6.20' of /linux/kernel/git/viro/bird into tmp