summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-02-20 10:56:05 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2017-02-20 10:56:05 +0000
commit4edaeb513bcc4831392de143ce63e5fd3b3ac3da (patch)
treeacf41f2c0cd8ab153d01f406d0802654474ba23a
parent99421d568a43cfb3934193fa395070e71c4ece39 (diff)
parenta238050e3b9839034f792463aa5a8ab9c8e188b2 (diff)
parent43d2a390d28557762d259fb708fb1a34f5906562 (diff)
Merge branches 'clearfog-sent', 'mvebu-cpuidle' and 'phy' into clearfog