summaryrefslogtreecommitdiff
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
authorDeepak Khungar <deepak.khungar@broadcom.com>2017-02-12 19:18:18 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-12 22:18:49 -0500
commit32b40798c1b40343641f04cdfd09652af70ea0e9 (patch)
tree9d14df9b9731493be45194bc9360de8812cb3f91 /net/ipv6/addrconf.c
parentb451c8b69e70de299aa6061e1fa6afbb4d7c1f9e (diff)
bnxt_en: Added PCI IDs for BCM57452 and BCM57454 ASICs
Signed-off-by: Deepak Khungar <deepak.khungar@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
0 files changed, 0 insertions, 0 deletions
'>diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro. The most notable fix here is probably the fix for a splice regression ("fix a fencepost error in pipe_advance()") noticed by Alan Wylie. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix a fencepost error in pipe_advance() coredump: Ensure proper size of sparse core files aio: fix lock dep warning tmpfs: clear S_ISGID when setting posix ACLs
Diffstat (limited to 'sound/soc/intel/atom/sst/sst.h')