summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_mode_tunnel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 11:48:45 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 11:48:45 +0100
commit24e1c13c93cbdd05e4b7ea921c0050b036555adc (patch)
tree60e5b54f1ce6db72507e6f20f19bffe5854793b8 /net/ipv4/xfrm4_mode_tunnel.c
parentdocbook: rapidio: fix fatal filename error (diff)
parentblock: kill swap_io_context() (diff)
downloadlinux-24e1c13c93cbdd05e4b7ea921c0050b036555adc.tar.xz
linux-24e1c13c93cbdd05e4b7ea921c0050b036555adc.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: kill swap_io_context() as-iosched: fix inconsistent ioc->lock context ide-cd: fix leftover data BUG block: make elevator lib checkpatch compliant cfq-iosched: make checkpatch compliant block: make core bits checkpatch compliant block: new end request handling interface should take unsigned byte counts unexport add_disk_randomness block/sunvdc.c:print_version() must be __devinit splice: always updated atime in direct splice
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
0 files changed, 0 insertions, 0 deletions