Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Oct 2005 15:41:06 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Oct 2005 15:41:06 +0000 (08:41 -0700)

Trivial merge