Merge branch 'for-rmk-devel-stable' of git://git.kernel.org/pub/scm/linux/kernel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 14 Mar 2011 22:27:03 +0000 (22:27 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 14 Mar 2011 22:27:03 +0000 (22:27 +0000)

Trivial merge