Merge master.kernel.org:~rmk/linux-2.6-arm.git