diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 16:31:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 16:31:20 -0800 |
| commit | e55fdbd7414a3ee991d7081a256153f61ea98b9f (patch) | |
| tree | 252d30f5821bbb10d95a0c2d77cf21a7f4e7d5e3 /arch/parisc/kernel/firmware.c | |
| parent | c522682d7433d27461d631d03a2a1a3b741e9c91 (diff) | |
| parent | 8b3bb3ecf1934ac4a7005ad9017de1127e2fbd2f (diff) | |
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 'arch/parisc/kernel/firmware.c')
0 files changed, 0 insertions, 0 deletions