diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-12 21:34:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-12 21:34:56 -0400 |
| commit | fedfb947b2235c1085df97cf52f688b808c3a515 (patch) | |
| tree | 5eb0ffcd0eace60c7e206df6f33f9841b452f2b3 /net/ipv4/icmp.c | |
| parent | 44fa2b4bee5b07d506a7b002b4e2eb73654db7e0 (diff) | |
| parent | bade732a2848e640482c1e99629a90e085d574dd (diff) | |
Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux:
svcrdma: RDMA support not yet compatible with RPC6
Diffstat (limited to 'net/ipv4/icmp.c')
0 files changed, 0 insertions, 0 deletions