| commit | c4c5551df136a7c4edd7c2f433d9a296b39826a2 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jul 20 14:45:10 2018 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jul 20 21:17:12 2018 -0700 |
| tree | a33d9f228efd34b0ad18e380385093405ef72d98 | |
| parent | 40999f11ce677ce3c5d0e8f5f76c40192a26b479 [diff] | |
| parent | 48e5aee81f320da8abd1f09c8410f584315f59b0 [diff] |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>