Merge branch 'kvm-arm-fixes' of git://github.com/columbia/linux-kvm-arm into devel...
Russell King [Fri, 15 Mar 2013 00:14:28 +0000 (00:14 +0000)]

Trivial merge