OSDN Git Service

(root) / android-x86 / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5df22a6 e7062b1)
Merge branch 'cleanup/kconfig' into next/soc
authorOlof Johansson <olof@lixom.net>
Tue, 20 May 2014 05:27:05 +0000 (22:27 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 20 May 2014 06:29:01 +0000 (23:29 -0700)
commit5fe0163aea863b1a5f79173619fdfe9e9baad299
treec49a6f58a3d3d71825cf77477e1e2702d2ffe103tree | snapshot
parent5df22a6148d7f073513a61eb306a98654c5a6fe8commit | diff
parente7062b101537a0c4f4a8d725321772eb78100074commit | diff
Merge branch 'cleanup/kconfig' into next/soc

Bring in the cleanup branch due to conflicts in new additions. Should really
have been the base before the other branch, but this way works too.

* cleanup/kconfig:
  ARM: qcom: clean-up unneeded kconfig selects
  ARM: bcm: clean-up unneeded kconfig selects
  ARM: mvebu: clean-up unneeded kconfig selects

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-mvebu/Kconfig diff1 | diff2 | blob | history
kernel
About OSDN
Find Software
Develop Software
Help