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)

Trivial merge