summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-01-05 22:57:26 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2017-01-05 22:57:26 +0000
commitff9fc33afddc7050f738a4672fe3c37152c18ddf (patch)
tree8a3ea73627ae9a3bd0480fabdefcf5ca35f89571
parentc28ac586922654d59cee0ec6c63d0e79531413da (diff)
parente29df9b0e7670eb4382379a58fa99eb263ee1ebc (diff)
parentbb861118a3596d1bd12aebcd5ed02f88e162782b (diff)
Merge branches 'clearfog-sent', 'mvebu-cpuidle' and 'phy' into clearfog