Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 30 Apr 2005 22:42:33 +0000 (15:42 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 30 Apr 2005 22:42:33 +0000 (15:42 -0700)

Trivial merge