Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
commit1e87347c2f6e124d73b4921c4580adad4ac534d6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 16 May 2011 22:06:49 +0000 (16 23:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 16 May 2011 22:06:49 +0000 (16 23:06 +0100)
tree9c548931dced2383c7eb8978b4fb2696a46d1a49
parentf29251ff532ca1124d14a03b040ba097edc6e9c0
parent3cff484d4b264ff467a3b45c544cbbbab69f0bf8
Merge git://git./linux/kernel/git/nico/orion into devel-stable