diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-02-28 11:08:11 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-02-28 11:08:11 +0000 |
commit | 17a870bea3b86f464706b6ba2736210cb8602693 (patch) | |
tree | 7d734ea633982387fd6afcde9b8dae0549fb050b /drivers/mtd | |
parent | 9e3440481845b2ec22508f60837ee2cab2b6054f (diff) | |
parent | cdcc5fa0415d943288c6316bd32e76befb1027c5 (diff) | |
parent | c466bda60510eaac797e49db5d34555876d983ae (diff) | |
download | linux-17a870bea3b86f464706b6ba2736210cb8602693.tar.bz2 |
Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to indicate}' into for-linus