summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-07-09 16:41:53 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2019-07-09 16:41:53 +0100
commit40943b7a35378d02ef42893d739cd99c704d72e1 (patch)
tree58d80fe01dfd203bd4dae9688d0d8a411244a6c7
parentb78dc79665d2debaebfc0470e74409713011c3c9 (diff)
parentb5c111819d1f7b8a52468497a47e7ab73c165945 (diff)
parentbf18cbaddb72fa1361399d3e9810865e7dc6d667 (diff)
Merge branches 'mvebu', 'mvpp2' and 'phy' into mcbin