summaryrefslogtreecommitdiff
path: root/arch/x86/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-18 16:29:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-18 16:29:42 -0800
commitf59e842fc0871cd5baa213dc32e0ce8e5aaf4758 (patch)
tree5fc24fe6bc8e49d9d939485f3804a7ef977254c0 /arch/x86/um
parent4ba3069fea9f0771dad3f4906b305ab50d5a1b30 (diff)
parenta42d985bd5b234da8b61347a78dc3057bf7bb94d (diff)
downloadlinux-next-f59e842fc0871cd5baa213dc32e0ce8e5aaf4758.tar.gz
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 'arch/x86/um')
0 files changed, 0 insertions, 0 deletions