Automatic merge of 'for-linus' branch from
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 29 May 2005 17:40:13 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 29 May 2005 17:40:13 +0000 (10:40 -0700)
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input


Trivial merge