Automated merge of kernel.org:/home/rmk/linux-2.6-rmk.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 25 Apr 2005 23:19:32 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 25 Apr 2005 23:19:32 +0000 (16:19 -0700)

Trivial merge