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

..

isapnp

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

pnpacpi

Merge branch 'linus' into irq/numa

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

pnpbios

pnpbios: propagate kthread_run() error

2009-04-02 19:04:52 -07:00

base.h

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

card.c

dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)

2009-04-07 08:31:12 -07:00

core.c

dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)

2009-04-07 08:31:12 -07:00

driver.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

interface.c

drivers: remove duplicated #include

2008-11-04 08:18:19 -08:00

Kconfig

PNP: remove old CONFIG_PNP_DEBUG option

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

Makefile

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

manager.c

PNP: convert to using pnp_dbg()

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

quirks.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

resource.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

support.c

PNP: convert to using pnp_dbg()

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

system.c

pnp: struct device - replace bus_id with dev_name(), dev_set_name()

2009-01-06 10:44:38 -08:00