diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 23:27:57 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 23:27:57 +0400 |
| commit | cb3599926e3e7b3678583195effa61a03026ab0e (patch) | |
| tree | 775419d69e8732ba3f4933d3b7a07e98ae555458 /net/ipv6/ip6mr.c | |
| parent | 4244cb482e8eab18142162a27c8829a04585863a (diff) | |
| parent | f6f8285132907757ef84ef8dae0a1244b8cde6ac (diff) | |
| download | linux-cb3599926e3e7b3678583195effa61a03026ab0e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: pass allocated memory region back to caller
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions