Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 5 Dec 2011 23:27:54 +0000 (23:27 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 5 Dec 2011 23:27:59 +0000 (23:27 +0000)

Trivial merge