summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_mode_tunnel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-08 19:55:29 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-08 19:55:29 +0100
commit5398a64c63a69a0ac33dbae458ea4aab0dc23f14 (patch)
treeae3c668c3247df18db0a293cbcfad4a9e53d0fd7 /net/ipv4/xfrm4_mode_tunnel.c
parentMerge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentTTY: move .gitignore from drivers/char/ to drivers/tty/vt/ (diff)
downloadlinux-5398a64c63a69a0ac33dbae458ea4aab0dc23f14.tar.xz
linux-5398a64c63a69a0ac33dbae458ea4aab0dc23f14.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: TTY: move .gitignore from drivers/char/ to drivers/tty/vt/ TTY: create drivers/tty/vt and move the vt code there TTY: create drivers/tty and move the tty core files there
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
0 files changed, 0 insertions, 0 deletions