summaryrefslogtreecommitdiff
path: root/drivers/net/slip
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-07-30 01:13:24 +0300
committerThomas Gleixner <tglx@linutronix.de>2015-07-30 01:13:24 +0300
commit4b979e4c611ce750d32b51737f837b485f43c69b (patch)
tree3bc56f2a22d2cf29bc183b67e74e1e8c0733efc0 /drivers/net/slip
parent1559f3b8d0527e24219149c95b3de5e7b2924828 (diff)
parentcbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff)
downloadlinux-4b979e4c611ce750d32b51737f837b485f43c69b.tar.xz
Merge branch 'linus' into irq/core
Pull in upstream fixes before applying conflicting changes
Diffstat (limited to 'drivers/net/slip')
0 files changed, 0 insertions, 0 deletions