diff options
author | 2011-03-03 12:42:48 -0800 | |
---|---|---|
committer | 2011-03-03 12:42:48 -0800 | |
commit | c640e13f8efeb38daa4c0b0891a46d32b01e51ac (patch) | |
tree | e4f5963008d2c8288b4f12cfc812be6dba8f7e5d /net/ipv4/netfilter.c | |
parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | nilfs2: fix regression that i-flag is not set on changeless checkpoints (diff) | |
download | wireguard-linux-c640e13f8efeb38daa4c0b0891a46d32b01e51ac.tar.xz wireguard-linux-c640e13f8efeb38daa4c0b0891a46d32b01e51ac.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix regression that i-flag is not set on changeless checkpoints
Diffstat (limited to 'net/ipv4/netfilter.c')
0 files changed, 0 insertions, 0 deletions