Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
Jeff Garzik [Mon, 20 Mar 2006 09:38:50 +0000 (04:38 -0500)]

Trivial merge