diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 20:42:43 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 20:42:43 +0100 |
commit | 7f3d1f984336377074ebf804ff53869ef1906fbe (patch) | |
tree | 4445a65546d93bad6f3ea4d457635af9a18a9249 /arch/arm | |
parent | ARM: 8720/1: ensure dump_instr() checks addr_limit (diff) | |
parent | ARM: 8717/2: debug printch/printascii: translate '\n' to "\r\n" not "\n\r" (diff) | |
parent | pcmcia: sa1111: remove special sa1111 mmio accessors (diff) | |
download | linux-7f3d1f984336377074ebf804ff53869ef1906fbe.tar.xz linux-7f3d1f984336377074ebf804ff53869ef1906fbe.zip |
Merge branches 'fixes', 'misc' and 'sa1111-for-next' into for-next