Merge branch 'nmi' of git://ftp.arm.linux.org.uk/~rmk/linux-arm