summaryrefslogtreecommitdiffstats
path: root/net/lapb/lapb_in.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-07-28 13:41:12 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-07-28 13:41:12 +1000
commitcdc2652ee581366798a9ac303b5d855ceebea8d9 (patch)
tree0cf894e6ba1aba41001984d954969dcc0112a446 /net/lapb/lapb_in.c
parentc49f63530bb689744932be88fecb3fd850300876 (diff)
parent396a34340cdf7373c00e3977db27d1a20ea65ebc (diff)
Merge branch 'merge' into next
Bring in some important fixes from the 3.16 branch
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions