Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel