Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 25 Nov 2005 02:41:59 +0000 (18:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 25 Nov 2005 02:41:59 +0000 (18:41 -0800)

Trivial merge