Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 23:06:47 +0000 (16:06 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 23:06:47 +0000 (16:06 -0700)

Trivial merge