Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Replace 40c7869b kludge [MIPS] Lasat: Fix built in separate object directory. [MIPS] Malta: Fix software reset on big endian [MIPS] pnx8xxx: move to clocksource [MIPS] Wrong CONFIG option prevents setup of DMA zone.
Showing
- arch/mips/kernel/setup.c 3 additions, 4 deletionsarch/mips/kernel/setup.c
- arch/mips/lasat/image/Makefile 3 additions, 3 deletionsarch/mips/lasat/image/Makefile
- arch/mips/mips-boards/generic/memory.c 0 additions, 2 deletionsarch/mips/mips-boards/generic/memory.c
- arch/mips/mips-boards/generic/reset.c 6 additions, 4 deletionsarch/mips/mips-boards/generic/reset.c
- arch/mips/mm/dma-default.c 1 addition, 1 deletionarch/mips/mm/dma-default.c
- arch/mips/philips/pnx8550/common/time.c 72 additions, 37 deletionsarch/mips/philips/pnx8550/common/time.c
Loading
Please register or sign in to comment