]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 276165d a027b28)
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)
commitefba9f3671316cffe802ab083b61e8528b34a786
treec49a6f58a3d3d71825cf77477e1e2702d2ffe103tree | snapshot
parent276165d32ff3b1c8c3d7d1dc2f4e53995c2a8e2ccommit | diff
parenta027b289507e7bfd1ad7c35385918e9baf82eb41commit | 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
Linux Kernel Source Tree.