Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/git
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 7 Jul 2005 22:56:49 +0000 (15:56 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 7 Jul 2005 22:56:49 +0000 (15:56 -0700)

Trivial merge