Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (45 commits) [MIPS] Pb1200/DBAu1200: move platform code to its proper place [MIPS] Fix handling of trap and breakpoint instructions [MIPS] Pb1200: do register SMC 91C111 [MIPS] DBAu1200: fix bad SMC 91C111 resource size [NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532 [MIPS] IP27: Fix build bug due to missing include [MIPS] Fix some sparse warnings on traps.c and irq-msc01.c [MIPS] cevt-gt641xx: Kill unnecessary include [MIPS] DS1287: Add clockevent driver [MIPS] add DECstation I/O ASIC clocksource [MIPS] rbtx4938: minor cleanup [MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro [MIPS] rbtx4938: misc cleanups [MIPS] jmr3927: use generic txx9 gpio [MIPS] rbhma4500: use generic txx9 gpio [MIPS] generic txx9 gpio support [MIPS] make fallback gpio.h gpiolib-friendly [MIPS] unexport null_perf_irq() and make it static [MIPS] unexport rtc_mips_set_time() [MIPS] unexport copy_from_user_page() ...
Showing
- include/asm-mips/mips-boards/launch.h 35 additions, 0 deletionsinclude/asm-mips/mips-boards/launch.h
- include/asm-mips/mips-boards/malta.h 23 additions, 0 deletionsinclude/asm-mips/mips-boards/malta.h
- include/asm-mips/mips-boards/maltaint.h 27 additions, 0 deletionsinclude/asm-mips/mips-boards/maltaint.h
- include/asm-mips/mips-boards/maltasmp.h 36 additions, 0 deletionsinclude/asm-mips/mips-boards/maltasmp.h
- include/asm-mips/mipsmtregs.h 4 additions, 4 deletionsinclude/asm-mips/mipsmtregs.h
- include/asm-mips/pgtable-32.h 2 additions, 2 deletionsinclude/asm-mips/pgtable-32.h
- include/asm-mips/pgtable-bits.h 41 additions, 50 deletionsinclude/asm-mips/pgtable-bits.h
- include/asm-mips/pgtable.h 32 additions, 25 deletionsinclude/asm-mips/pgtable.h
- include/asm-mips/r4k-timer.h 30 additions, 0 deletionsinclude/asm-mips/r4k-timer.h
- include/asm-mips/smp-ops.h 1 addition, 0 deletionsinclude/asm-mips/smp-ops.h
- include/asm-mips/smtc.h 1 addition, 0 deletionsinclude/asm-mips/smtc.h
- include/asm-mips/smvp.h 19 additions, 0 deletionsinclude/asm-mips/smvp.h
- include/asm-mips/traps.h 2 additions, 0 deletionsinclude/asm-mips/traps.h
- include/asm-mips/tx4938/rbtx4938.h 20 additions, 38 deletionsinclude/asm-mips/tx4938/rbtx4938.h
- include/asm-mips/tx4938/tx4938.h 1 addition, 37 deletionsinclude/asm-mips/tx4938/tx4938.h
- include/asm-mips/tx4938/tx4938_mips.h 0 additions, 54 deletionsinclude/asm-mips/tx4938/tx4938_mips.h
- include/asm-mips/txx9pio.h 29 additions, 0 deletionsinclude/asm-mips/txx9pio.h
Loading
Please register or sign in to comment