Merge branches 'fixes' and 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 Mar 2011 20:54:54 +0000 (21:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 Mar 2011 20:54:54 +0000 (21:54 +0100)
commitb43d151e9679a06df896ac3db65a9dca80040fed
treeac0b71ef0a28f795700d85a8c8e23ba3fb6eef30
parentdfad549d98b60160547d1b8299051b9456c8da85
parent5f183860d5007ec76ea36bfa6c36d66e37f0dbcf
Merge branches 'fixes' and 'devel-stable' into for-linus