Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Mon, 8 Jan 2007 03:44:56 +0000 (22:44 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 8 Jan 2007 03:44:56 +0000 (22:44 -0500)

Trivial merge