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)
commit7eca2bc38a677afce6b073e7148cf3fa468043be
treeac0b71ef0a28f795700d85a8c8e23ba3fb6eef30
parent1649841168d060bbc1103b39f1cbbccda3c05505
parent6f363704f442f72b849886da86c7f912c727c9b2
Merge branches 'fixes' and 'devel-stable' into for-linus