diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-24 00:26:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-24 00:51:33 +0200 |
| commit | 1602f49b58abcb0d34a5f0a29d68e7c1769547aa (patch) | |
| tree | 4848fb0ffbc581ff465fd9c9e5a5b10b06f09b68 /drivers/iio/light/Kconfig | |
| parent | Merge branch 'geneve-vxlan-deps' (diff) | |
| parent | Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abello... (diff) | |
| download | linux-1602f49b58abcb0d34a5f0a29d68e7c1769547aa.tar.xz linux-1602f49b58abcb0d34a5f0a29d68e7c1769547aa.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were two cases of simple overlapping changes,
nothing serious.
In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/iio/light/Kconfig')
0 files changed, 0 insertions, 0 deletions