Merge branch 'highmem' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)

Trivial merge