summaryrefslogtreecommitdiff
path: root/net/xfrm/xfrm_ipcomp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-20 00:23:41 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-20 00:23:41 (GMT)
commit9d037a777695993ec7437e5f451647dea7919d4c (patch)
tree05f047598aeff2e48653bb6b3dfa3a63b2068e12 /net/xfrm/xfrm_ipcomp.c
parent50f2d407c09be74c77cf9d502d087398a5ba6055 (diff)
parent477694e71113fd0694b6bb0bcc2d006b8ac62691 (diff)
downloadlinux-9d037a777695993ec7437e5f451647dea7919d4c.tar.xz
Merge branch 'irq-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
* 'irq-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip: x86, iommu: Mark DMAR IRQ as non-threaded genirq: Make irq_shutdown() symmetric vs. irq_startup again
Diffstat (limited to 'net/xfrm/xfrm_ipcomp.c')
0 files changed, 0 insertions, 0 deletions