summaryrefslogtreecommitdiffstats
path: root/arch/x86/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-19 01:29:42 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-19 01:29:42 +0100
commitf59e842fc0871cd5baa213dc32e0ce8e5aaf4758 (patch)
tree5fc24fe6bc8e49d9d939485f3804a7ef977254c0 /arch/x86/um
parentMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/... (diff)
parentib_srpt: Initial SRP Target merge for v3.3-rc1 (diff)
downloadlinux-f59e842fc0871cd5baa213dc32e0ce8e5aaf4758.tar.xz
linux-f59e842fc0871cd5baa213dc32e0ce8e5aaf4758.zip
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