Merge commit 'v2.6.27-rc8' into oprofile
authorIngo Molnar <mingo@elte.hu>
Tue, 30 Sep 2008 10:16:26 +0000 (12:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 30 Sep 2008 10:16:26 +0000 (12:16 +0200)
commit59293c8ad54726150cf6178164311b004d615ce4
tree6fcf8e59a2c9ac08a4ff092544c34d2254ac0d74
parent45f197ade73ba95681b9803680c75352fc0a1c0a
parent94aca1dac6f6d21f4b07e4864baf7768cabcc6e7
Merge commit 'v2.6.27-rc8' into oprofile

Conflicts:
arch/x86/oprofile/nmi_int.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/oprofile/nmi_int.c
drivers/oprofile/cpu_buffer.c
include/linux/pci_ids.h