summaryrefslogtreecommitdiffstats
path: root/drivers/xen/xenfs
diff options
context:
space:
mode:
authorLinus Torvalds2011-01-21 01:31:20 +0100
committerLinus Torvalds2011-01-21 01:31:20 +0100
commite55fdbd7414a3ee991d7081a256153f61ea98b9f (patch)
tree252d30f5821bbb10d95a0c2d77cf21a7f4e7d5e3 /drivers/xen/xenfs
parentMerge branch 'for-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm (diff)
parentvirtio: remove virtio-pci root device (diff)
downloadkernel-qcow2-linux-e55fdbd7414a3ee991d7081a256153f61ea98b9f.tar.gz
kernel-qcow2-linux-e55fdbd7414a3ee991d7081a256153f61ea98b9f.tar.xz
kernel-qcow2-linux-e55fdbd7414a3ee991d7081a256153f61ea98b9f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: virtio: remove virtio-pci root device LGUEST_GUEST: fix unmet direct dependencies (VIRTUALIZATION && VIRTIO) lguest: compile fixes lguest: Use this_cpu_ops lguest: document --rng in example Launcher lguest: example launcher to use guard pages, drop PROT_EXEC, fix limit logic lguest: --username and --chroot options
Diffstat (limited to 'drivers/xen/xenfs')
0 files changed, 0 insertions, 0 deletions