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() ...
No related branches found
No related tags found
Showing
- arch/mips/mm/cache.c 23 additions, 8 deletionsarch/mips/mm/cache.c
- arch/mips/mm/init.c 2 additions, 9 deletionsarch/mips/mm/init.c
- arch/mips/mm/page.c 684 additions, 0 deletionsarch/mips/mm/page.c
- arch/mips/mm/pg-r4k.c 0 additions, 534 deletionsarch/mips/mm/pg-r4k.c
- arch/mips/mm/pg-sb1.c 0 additions, 302 deletionsarch/mips/mm/pg-sb1.c
- arch/mips/mm/pgtable.c 0 additions, 1 deletionarch/mips/mm/pgtable.c
- arch/mips/mm/tlb-r4k.c 1 addition, 1 deletionarch/mips/mm/tlb-r4k.c
- arch/mips/mm/uasm.c 19 additions, 7 deletionsarch/mips/mm/uasm.c
- arch/mips/mm/uasm.h 4 additions, 0 deletionsarch/mips/mm/uasm.h
- arch/mips/nxp/pnx8550/common/Makefile 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/Makefile
- arch/mips/nxp/pnx8550/common/gdb_hook.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/gdb_hook.c
- arch/mips/nxp/pnx8550/common/int.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/int.c
- arch/mips/nxp/pnx8550/common/pci.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/pci.c
- arch/mips/nxp/pnx8550/common/platform.c 1 addition, 1 deletionarch/mips/nxp/pnx8550/common/platform.c
- arch/mips/nxp/pnx8550/common/proc.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/proc.c
- arch/mips/nxp/pnx8550/common/prom.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/prom.c
- arch/mips/nxp/pnx8550/common/reset.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/reset.c
- arch/mips/nxp/pnx8550/common/setup.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/setup.c
- arch/mips/nxp/pnx8550/common/time.c 0 additions, 0 deletionsarch/mips/nxp/pnx8550/common/time.c
- arch/mips/nxp/pnx8550/jbs/Makefile 1 addition, 1 deletionarch/mips/nxp/pnx8550/jbs/Makefile
Loading
Please register or sign in to comment