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

Trivial merge