3d58f48ba0
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> |
||
|---|---|---|
| .. | ||
| isapnp | ||
| pnpacpi | ||
| pnpbios | ||
| base.h | ||
| card.c | ||
| core.c | ||
| driver.c | ||
| interface.c | ||
| Kconfig | ||
| Makefile | ||
| manager.c | ||
| quirks.c | ||
| resource.c | ||
| support.c | ||
| system.c | ||