Merge /home/torvalds/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 17:12:50 +0000 (10:12 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 17:12:50 +0000 (10:12 -0700)

Trivial merge