summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-02-28 11:08:11 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2017-02-28 11:08:11 +0000
commit17a870bea3b86f464706b6ba2736210cb8602693 (patch)
tree7d734ea633982387fd6afcde9b8dae0549fb050b
parent9e3440481845b2ec22508f60837ee2cab2b6054f (diff)
parentcdcc5fa0415d943288c6316bd32e76befb1027c5 (diff)
parentc466bda60510eaac797e49db5d34555876d983ae (diff)
downloadlinux-17a870bea3b86f464706b6ba2736210cb8602693.tar.bz2
Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to indicate}' into for-linus