Merge branch 'kmap_atomic_fixes' of git://git.linaro.org/people/nico/linux
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 20 Dec 2010 11:03:35 +0000 (11:03 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 20 Dec 2010 11:03:35 +0000 (11:03 +0000)

Trivial merge