diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
| commit | 68aaf4459556b1f9370c259fd486aecad2257552 (patch) | |
| tree | 99d92536a3263634969be6b70a96facea85a0df1 /sound/soc/mxs | |
| parent | d00ee466a07eb9182ad3caf6140c7ebb527b4c64 (diff) | |
| parent | 9e8312f5e160ade069e131d54ab8652cf0e86e1a (diff) | |
| download | linux-68aaf4459556b1f9370c259fd486aecad2257552.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/mxs')
0 files changed, 0 insertions, 0 deletions