diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:24:06 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:24:06 +0200 |
commit | 11d708f414a78b8e2903cbcff34bec69c73ba1b5 (patch) | |
tree | 62acc8abe37cfea9d4d4c95bdd5299de7daa16bc /.mailmap | |
parent | 48bc03e5411eb0fd006e54ba62ca77a6dfe5c68d (diff) | |
parent | 35bee33355db8347d5f84caef9d2ddde200b8ba6 (diff) |
Merge tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/defconfig
Merge "Ux500 defconfig update for v4.7" from Linus Walleij:
- Remove the unused MACH_UX500_DT option from the multi_v7 defconfig
- Remove staging driver from u8500_defconfig
- Update sensor support in u8500_defconfig
* tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: u8500_defconfig: update sensor config
ARM: u8500_defconfig: remove staging from defconfig
ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions