Merge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 23:44:01 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 23:44:01 +0000 (16:44 -0700)

Trivial merge