summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-01-28 21:38:48 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-01-28 21:38:48 +0000
commitf5137a45c20713f06535b7d952b72b673c27488f (patch)
tree75355c4aa6a14d1790406c02ef04231d6d11e3f3
parent54c0a4b46150db1571d955d598cd342c9f1d9657 (diff)
parentd326b65c57d64208646206d0bfd4e2d19d6df38c (diff)
parentc5ca95b507c8a2a69e49eeda539b41bd76922d7f (diff)
Merge branches 'fixes' and 'misc' into for-linus