Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:18:15 +0000 (06:18 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:18:15 +0000 (06:18 -0400)

Trivial merge