Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes

First ever true git merge. Let's see if it actually works.