diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-07 22:29:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-07 22:29:30 +0100 |
| commit | 3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) | |
| tree | f4abe2f05e173023d2a262afd4aebb1e89fe6985 /Documentation/leds/leds-lp3944.txt | |
| parent | liquidio: do not dereference pointer if it's NULL (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-3efa70d78f218e4c9276b0bac0545e5184c1c47b.tar.xz linux-3efa70d78f218e4c9276b0bac0545e5184c1c47b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/leds/leds-lp3944.txt')
0 files changed, 0 insertions, 0 deletions