summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-11-08 19:42:43 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2017-11-08 19:42:43 +0000
commit7f3d1f984336377074ebf804ff53869ef1906fbe (patch)
tree4445a65546d93bad6f3ea4d457635af9a18a9249 /arch/arm
parentb9dd05c7002ee0ca8b676428b2268c26399b5e31 (diff)
parent2a14b80cb03bee9a4973e5a91e0ed48df25b57ce (diff)
parentde854b336d209095b64b3b6c5c1c6a13938ef2d6 (diff)
Merge branches 'fixes', 'misc' and 'sa1111-for-next' into for-next