aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-11 14:50:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-04-11 14:50:05 +0100
commit53f1d9afb4c85c4d6a107420188d84ddf76ebbc0 (patch)
tree5e4ddea79c08a2e0424c9d64c4b1e08decbf0442 /arch
parentbce5669be3a8946952258a064ef26defeb887138 (diff)
parentc9d347e0277696c80496161cbef47393b850a0aa (diff)
parentb5b6b5f5442860474ebd263cfd3e4a2a972632d8 (diff)
Merge branches 'fixes' and 'misc' into for-next