summaryrefslogtreecommitdiffstats
path: root/lib/locking-selftest-spin-softirq.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-09-05 20:58:52 +0200
committerDavid S. Miller <davem@davemloft.net>2013-09-05 20:58:52 +0200
commit06c54055bebf919249aa1eb68312887c3cfe77b4 (patch)
tree223a49c09e5d26516ed0161b8a52d08454ae028e /lib/locking-selftest-spin-softirq.h
parentnetfilter: Fix build errors with xt_socket.c (diff)
parenttcp: Add missing braces to do_tcp_setsockopt (diff)
downloadlinux-06c54055bebf919249aa1eb68312887c3cfe77b4.tar.xz
linux-06c54055bebf919249aa1eb68312887c3cfe77b4.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/locking-selftest-spin-softirq.h')
0 files changed, 0 insertions, 0 deletions