Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Wed, 9 May 2007 22:54:49 +0000 (18:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 May 2007 22:54:49 +0000 (18:54 -0400)

Trivial merge