tree 63d7bcd1ab22c73fb2ecd1670e6bc5c67f6ab560
parent 9e25ebfe56ece7541cd10a20d715cbdd148a2e06
parent cd83935be8f5c28ea099ad1efa6321c737e2e12a
author Russell King <rmk+kernel@armlinux.org.uk> 1499249219 +0100
committer Russell King <rmk+kernel@armlinux.org.uk> 1499249219 +0100

Merge branches 'fixes' and 'misc' into for-linus