| commit | 674b5d58366e3f319520a89785c292a60aacb702 | [log] [tgz] |
|---|---|---|
| author | Darren Hart <dvhart@infradead.org> | Wed Mar 29 12:19:42 2017 -0700 |
| committer | Darren Hart (VMware) <dvhart@infradead.org> | Thu Apr 13 10:14:09 2017 -0700 |
| tree | c3ffbc0c7b14aa56c22802a000acbfb42e5f8d1e | |
| parent | 6b8e7d8f6881109dedfcf721d72f6bc822f4c580 [diff] | |
| parent | ab768386116d0d88b944d0ef958adff082c088a8 [diff] |
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>