summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2018-08-13 16:28:50 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2018-08-13 16:28:50 +0100
commitc61b466d4f886613c7e71de8282701646a4d999d (patch)
treeccb5639773c86cbea94d1c11a133fd23f52a21ca /arch/arm/lib
parentafc9f65e01cd114cb2cedf544d22239116ce0cc6 (diff)
parent001a30c4d0e871b21d296e1bcafc6756a1b10607 (diff)
parenta3c0f84765bb429ba0fd23de1c57b5e1591c9389 (diff)
downloadlinux-c61b466d4f886613c7e71de8282701646a4d999d.tar.bz2
Merge branches 'fixes', 'misc' and 'spectre' into for-linus
Conflicts: arch/arm/include/asm/uaccess.h Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>