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:
lguest: struct device - replace bus_id with

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:
lguest: struct device - replace bus_id with dev_name()
lguest: move the initial guest page table creation code to the host
kvm-s390: implement config_changed for virtio on s390
virtio_console: support console resizing
virtio: add PCI device release() function
virtio_blk: fix type warning
virtio: block: dynamic maximum segments
virtio: set max_segment_size and max_sectors to infinite.
virtio: avoid implicit use of Linux page size in balloon interface
virtio: hand virtio ring alignment as argument to vring_new_virtqueue
virtio: use KVM_S390_VIRTIO_RING_ALIGN instead of relying on pagesize
virtio: use LGUEST_VRING_ALIGN instead of relying on pagesize
virtio: Don't use PAGE_SIZE for vring alignment in virtio_pci.
virtio: rename 'pagesize' arg to vring_init/vring_size
virtio: Don't use PAGE_SIZE in virtio_pci.c
virtio: struct device - replace bus_id with dev_name(), dev_set_name()
virtio-pci queue allocation not page-aligned

show more ...

virtio: avoid implicit use of Linux page size in balloon interface

Make the balloon interface always use 4K pages, and convert Linux pfns if
necessary. This patch assumes that Linux's PAGE_SHIFT wil

virtio: avoid implicit use of Linux page size in balloon interface

Make the balloon interface always use 4K pages, and convert Linux pfns if
necessary. This patch assumes that Linux's PAGE_SHIFT will never be less than
12.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (modified)

show more ...

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h

Merge branch 'linus' into core/debug

Conflicts:
lib/vsprintf.c

Manual merge:

include/linux/kernel.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus

Merge branch 'linus' into oprofile-v2

Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h

Merge branch 'linus' into x86/xsave

Merge commit 'v2.6.27-rc8' into x86/setup

Merge commit 'v2.6.27-rc8' into genirq

Merge commit 'v2.6.27-rc8' into oprofile

Conflicts:
arch/x86/oprofile/nmi_int.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
arch/x86/oprofile/nmi_int.c

Merge commit 'v2.6.27-rc7' into x86/microcode

Merge commit 'v2.6.27-rc7' into x86/pebs

Merge commit 'v2.6.27-rc7' into x86/debug

Merge commit 'v2.6.27-rc6' into x86/cleanups

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Conflicts:

arch/sparc64/kernel/pci_psycho.c

Merge commit 'v2.6.27-rc6' into timers/hpet

Merge commit 'v2.6.27-rc6' into x86/pat

Merge branch 'core/xen' into x86/xen

Merge commit 'v2.6.27-rc6' into x86/iommu

Merge commit 'v2.6.27-rc6' into core/rcu

Merge branch 'linux-2.6'

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

net/mac80211/mlme.c