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> |
||
|---|---|---|
| .. | ||
| executive | ||
| Kconfig | ||
| Makefile | ||
| csrc-octeon.c | ||
| dma-octeon.c | ||
| flash_setup.c | ||
| octeon-irq.c | ||
| octeon-memcpy.S | ||
| serial.c | ||
| setup.c | ||
| smp.c | ||