Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 27 Sep 2005 01:32:48 +0000 (18:32 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 27 Sep 2005 01:32:48 +0000 (18:32 -0700)

Trivial merge