diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-24 12:12:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-24 12:12:40 -0800 |
| commit | d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5 (patch) | |
| tree | 4ba57a6ec31f3a4683e7766fbf4f182d459a8b51 /net/ipv4/ip_gre.c | |
| parent | 4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518 (diff) | |
| parent | 46fe44ce8777f087aa8ad4a2605fdcfb9c2d63af (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: Pass information that quota is stored in system file to userspace
ext2: protect inode changes in the SETVERSION and SETFLAGS ioctls
jbd: Issue cache flush after checkpointing
Diffstat (limited to 'net/ipv4/ip_gre.c')
0 files changed, 0 insertions, 0 deletions