diff options
| author | Darren Hart <dvhart@infradead.org> | 2017-03-29 12:19:42 -0700 |
|---|---|---|
| committer | Darren Hart (VMware) <dvhart@infradead.org> | 2017-04-13 10:14:09 -0700 |
| commit | 674b5d58366e3f319520a89785c292a60aacb702 (patch) | |
| tree | c3ffbc0c7b14aa56c22802a000acbfb42e5f8d1e /Documentation/parisc | |
| 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>
Diffstat (limited to 'Documentation/parisc')
0 files changed, 0 insertions, 0 deletions