summaryrefslogtreecommitdiff
path: root/include/net/cipso_ipv4.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 01:10:53 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 01:10:53 (GMT)
commit3610639d1fceb09cb418c65fcbe9136c31eee03a (patch)
tree78aa6de9e9495c39f8671aed927fece5adff8d24 /include/net/cipso_ipv4.h
parentcfa97f993c275d193fe82c22511dfb5f1e51b661 (diff)
parent82c5b7b527ccc4b5d3cf832437e842f9d2920a79 (diff)
downloadlinux-fsl-qoriq-3610639d1fceb09cb418c65fcbe9136c31eee03a.tar.xz
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer: splitout peek ahead functionality, fix hrtimer: fixup comments hrtimer: fix recursion deadlock by re-introducing the softirq hrtimer: simplify hotplug migration hrtimer: fix HOTPLUG_CPU=n compile warning hrtimer: splitout peek ahead functionality
Diffstat (limited to 'include/net/cipso_ipv4.h')
0 files changed, 0 insertions, 0 deletions