Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 4 Jan 2012 09:01:51 +0000 (09:01 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 4 Jan 2012 09:01:51 +0000 (09:01 +0000)

Trivial merge