Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:48:25 +0000 (15:48 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:48:25 +0000 (15:48 -0400)

Trivial merge