Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Mon, 1 Jun 2009 08:01:03 +0000 (10:01 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 1 Jun 2009 08:01:39 +0000 (10:01 +0200)
commit23db9f430be9325a861c7762c1ffadad9ca528a8
tree1ebb681611c96f17aa4f96e28d6923824a8b210f
parent27b9613b7be39412775d0ab80f57229aa73bb07d
parent3218911f839b6c85acbf872ad264ea69aa4d89ad
Merge branch 'linus' into perfcounters/core

Merge reason: merge almost-rc8 into perfcounters/core, which was -rc6
              based - to pick up the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/cpu/common.c