projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e415765 e4d223b)
Merge tag 'mvebu-defconfig-3.18' of git://git.infradead.org/linux-mvebu into next...
authorOlof Johansson <olof@lixom.net>
Wed, 24 Sep 2014 17:41:01 +0000 (10:41 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 24 Sep 2014 17:41:15 +0000 (10:41 -0700)
Merge "ARM: mvebu: defconfig changes for v3.18" from Jason Cooper:

mvebu defconfig changes for v3.18

 - mvebu_v7
    - add LED class
    - add gpio-fan
    - add 'useful' options

* tag 'mvebu-defconfig-3.18' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add gpio-fan to mvebu_v7_defconfig
  ARM: mvebu: add LED class support built-in in mvebu_v7_defconfig
  ARM: mvebu: update v7 defconfig with useful options

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge