Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilma...
authorArnd Bergmann <arnd@arndb.de>
Thu, 30 Mar 2017 15:44:46 +0000 (17:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 30 Mar 2017 15:44:46 +0000 (17:44 +0200)
commit6b0eb184939e015c4d9a38965c13f2a4bddb44ec
tree60c1c8fb2484dccb97445a82bfd6de0f18f27d56
parent0563ff3702d8d2c752bbc169742e15f6f8fc8228
parent95fbe8b08b2d420e4f5a77701f165d6b23827862
Merge tag 'amlogic-defconfig' of git://git./linux/kernel/git/khilman/linux-amlogic into next/arm64

Pull "Amlogic: defconfig changes for v4.12" from Kevin Hilman:

- enable PWM LEDs and LEDs default-on trigger

* tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: defconfig: enable the leds-pwm driver and default-on trigger
arch/arm64/configs/defconfig