OSDN Git Service

Merge branch 'linux-leds/dell-laptop-changes-for-4.12'
authorDarren Hart <dvhart@infradead.org>
Wed, 29 Mar 2017 19:19:42 +0000 (12:19 -0700)
committerDarren Hart (VMware) <dvhart@infradead.org>
Thu, 13 Apr 2017 17:14:09 +0000 (10:14 -0700)
commit674b5d58366e3f319520a89785c292a60aacb702
treec3ffbc0c7b14aa56c22802a000acbfb42e5f8d1e
parent6b8e7d8f6881109dedfcf721d72f6bc822f4c580
parentab768386116d0d88b944d0ef958adff082c088a8
Merge branch 'linux-leds/dell-laptop-changes-for-4.12'

Merge branch 'dell-laptop-changes-for-4.12' of
git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
to avoid linux-next merge conflict with dell-laptop.c.

Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
drivers/platform/x86/dell-laptop.c