diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-13 08:40:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-13 08:40:51 +0300 |
| commit | f82202bae3f7f076402b16ca7bced9928aad16d0 (patch) | |
| tree | 129c1e663ed0ce3cf8a111cf020dddd8a84e0ea1 /include/net/ndisc.h | |
| parent | 21d2f8dc91e4eb987999092aabbb5f8409a1ab50 (diff) | |
| parent | 057cbf49a1f08297877e46c82f707b1bfea806a8 (diff) | |
| download | linux-f82202bae3f7f076402b16ca7bced9928aad16d0.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull tcm_vhost level target fabric driver from Nicholas Bellinger: "Here is the PULL request for the initial merge of tcm_vhost based on RFC-v5 code with MST's ACK appended to the initial merge commit." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: tcm_vhost: Initial merge for vhost level target fabric driver
Diffstat (limited to 'include/net/ndisc.h')
0 files changed, 0 insertions, 0 deletions