Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ...

Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

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

2009-06-01 21:06:21 +02:00

..

core.c

ACPI: suspend: don't let device _PS3 failure prevent suspend

2009-05-08 00:22:29 -04:00

Kconfig

ACPI: always enable CONFIG_PNPACPI on CONFIG_ACPI kernels

2007-02-15 22:38:04 -05:00

Makefile

PNP: remove old CONFIG_PNP_DEBUG option

2008-10-10 23:35:33 -04:00

pnpacpi.h

PNPACPI: move _CRS/_PRS warnings closer to the action

2008-04-29 03:22:30 -04:00

rsparser.c

irq: change ACPI GSI APIs to also take a device argument

2009-04-28 12:21:17 +02:00