summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-07-07 16:12:23 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2017-07-07 16:12:23 +0100
commit690041e9cb1f011d91ce4231aa459f2969f4c4bd (patch)
treec12b43560c2f33efbc3e0cdee030df7710aa9aa0
parent5c9a3d66396c1bd576080972b617bfba8fa88d62 (diff)
parent115ad55a086b7025d24afca19bf7b89be818e70d (diff)
parenta1cc320e0ba27e0b7a807db68cc6ac790697c500 (diff)
Merge branches 'mvebu-cpuidle', 'mvebu-pci' and 'phy' into clearfog