]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48bc03e 35bee33)
Merge tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 12:24:06 +0000 (14:24 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 12:24:06 +0000 (14:24 +0200)
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

1  2 
arch/arm/configs/multi_v7_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.