Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
commitc93212f387fdf5180d9d13cc207419abd5b3ec17
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 3 May 2011 20:09:11 +0000 (3 21:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 3 May 2011 20:09:11 +0000 (3 21:09 +0100)
treee1534d6051327711ea8aa07e3158fd86d138107d
parent5933f2ae353a93b1d3b501bc63c925531849bbc7
parentf5178ddd2f09de8b1cfc5e19043892e8b24666cb
Merge git://git./linux/kernel/git/nico/orion into devel-stable