summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-12-14 11:13:46 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2016-12-14 11:13:46 +0000
commit41884629fe579bde263dfc3d1284d0f5c7af7d1a (patch)
treeba6baec7832af7ffd13a5e191a895f13c7fec31e /arch
parent9388093db44356af911adf3d355b7544a13a63cd (diff)
parent8478132a8784605fe07ede555f7277d989368d73 (diff)
parent76fb051d42945d142fe265b6ec79e06aa9cfb250 (diff)
parente642873dcce49f0c2b4df1b82283bc39775dce2d (diff)
downloadlinux-41884629fe579bde263dfc3d1284d0f5c7af7d1a.tar.bz2
Merge branches 'clkdev', 'fixes', 'misc' and 'sa1100-base' into for-linus