Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.

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

Merge commit 'v2.6.30-rc5' into sched/core

Merge reason: sched/core was on .30-rc1 before, update to latest fixes

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

Merge commit 'v2.6.30-rc5' into next

Merge branch 'x86/urgent' into x86/xen

Conflicts:
arch/frv/include/asm/pgtable.h
arch/x86/include/asm/required-features.h
arch/x86/xen/mmu.c

Merge reason: x86/xen was on a .29 base still, move i

Merge branch 'x86/urgent' into x86/xen

Conflicts:
arch/frv/include/asm/pgtable.h
arch/x86/include/asm/required-features.h
arch/x86/xen/mmu.c

Merge reason: x86/xen was on a .29 base still, move it to a fresher
branch and pick up Xen fixes as well, plus resolve
conflicts

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

show more ...

Merge branch 'master' into next

Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by:

Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.

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

show more ...

Merge commit 'takashi/topic/asoc' into for-2.6.31

Merge branch 'fix/asoc' into topic/asoc

Merge branch 'fix/pcm-jiffies-check' into fix/asoc

Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte

Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.

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

show more ...

Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

Conflicts:
arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency chan

Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

Conflicts:
arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.

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

show more ...

Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge

Merge branch 'linus' into x86/mm

Merge reason: refresh the topic: there's been 290 non-merges commits upstream
to arch/x86 alone.

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

Merge branch 'linus' into x86/urgent

Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.

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

Merge branch 'linus' into x86/apic

Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream

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

Merge branch 'core/urgent' into core/rcu

Merge reason: new patches to be queued up depend on:

ef631b0: rcu: Make hierarchical RCU less IPI-happy

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

sgi-xpc: clean up numerous globals

Introduce xpc_arch_ops and eliminate numerous individual global definitions.

Signed-off-by: Robin Holt <holt@sgi.com>
Cc: Dean Nelson <dcn@sgi.com>
Signed-off-by:

sgi-xpc: clean up numerous globals

Introduce xpc_arch_ops and eliminate numerous individual global definitions.

Signed-off-by: Robin Holt <holt@sgi.com>
Cc: Dean Nelson <dcn@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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 commit 'v2.6.27-rc8' into genirq

Merge branch 'x86/oprofile' into oprofile

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 commit 'v2.6.27-rc8' into x86/setup

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