summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-03-03 00:32:50 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-03-03 00:32:50 +0000
commit16af43fef87512f7324205783526f543ddcf09cf (patch)
tree28995abd8604d61ba84d97d28448ccccb91467c9
parent9664ffe6a16676fa4d6a238ad3d9bb6cc24825a1 (diff)
parentded3ef0fa71696d3cf631fa4b8ac65313f370b4c (diff)
parent653a761e4ba70bf12174dedcd5fbbf54f431abb3 (diff)
Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus