summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/crash.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-07-14 02:28:09 +0200
committerDavid S. Miller <davem@davemloft.net>2015-07-14 02:28:09 +0200
commit638d3c63811e31b2745f7fdd568b38c8abcffe03 (patch)
tree606426ab4de84e59c5f50e1e3cce6e24819d45af /arch/mips/kernel/crash.c
parentbridge: mdb: add vlan support for user entries (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-638d3c63811e31b2745f7fdd568b38c8abcffe03.tar.xz
linux-638d3c63811e31b2745f7fdd568b38c8abcffe03.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: net/bridge/br_mdb.c Minor conflict in br_mdb.c, in 'net' we added a memset of the on-stack 'ip' variable whereas in 'net-next' we assign a new member 'vid'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/mips/kernel/crash.c')
0 files changed, 0 insertions, 0 deletions