Merge branch 'for-rmk/prot-none' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 19 Nov 2012 11:30:29 +0000 (11:30 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 19 Nov 2012 11:30:29 +0000 (11:30 +0000)

Trivial merge