diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 16:29:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 16:29:42 -0800 |
| commit | f59e842fc0871cd5baa213dc32e0ce8e5aaf4758 (patch) | |
| tree | 5fc24fe6bc8e49d9d939485f3804a7ef977254c0 /fs/xfs/xfs_discard.c | |
| parent | 4ba3069fea9f0771dad3f4906b305ab50d5a1b30 (diff) | |
| parent | a42d985bd5b234da8b61347a78dc3057bf7bb94d (diff) | |
Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
* 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
ib_srpt: Initial SRP Target merge for v3.3-rc1
Diffstat (limited to 'fs/xfs/xfs_discard.c')
0 files changed, 0 insertions, 0 deletions