Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 17 Apr 2005 21:47:24 +0000 (14:47 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 17 Apr 2005 21:47:24 +0000 (14:47 -0700)
First ever true git merge. Let's see if it actually works.


Trivial merge