summaryrefslogtreecommitdiffstats
path: root/net/vmw_vsock
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-03 20:12:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-03 20:12:09 +0200
commit9250d9047d99e8175cdf9b8e84952d2c69f3ed6d (patch)
tree8ce1ff8f0e2c9b268a3afe1476cfe65962147aa4 /net/vmw_vsock
parentMerge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff)
parentMerge branch 'security-fixes' into fixes (diff)
downloadlinux-9250d9047d99e8175cdf9b8e84952d2c69f3ed6d.tar.xz
linux-9250d9047d99e8175cdf9b8e84952d2c69f3ed6d.zip
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull arm fixes fixes from Russell King: "This fixes a couple of problems with commit 48be69a026b2 ("ARM: move signal handlers into a vdso-like page"), one of which was originally discovered via my testing originally, but the fix for it was never actually committed. The other shows up on noMMU builds, and such platforms are extremely rare and as such are not part of my nightly testing" * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: fix nommu builds with 48be69a02 (ARM: move signal handlers into a vdso-like page) ARM: fix a cockup in 48be69a02 (ARM: move signal handlers into a vdso-like page)
Diffstat (limited to 'net/vmw_vsock')
0 files changed, 0 insertions, 0 deletions