Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Mon, 20 Mar 2006 09:38:50 +0000 (04:38 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 20 Mar 2006 09:38:50 +0000 (04:38 -0500)

Trivial merge