Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
Jeff Garzik [Thu, 23 Mar 2006 22:15:41 +0000 (17:15 -0500)]

Trivial merge