Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for...
authorRalf Baechle <ralf@linux-mips.org>
Thu, 13 Dec 2012 18:40:13 +0000 (19:40 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 13 Dec 2012 18:40:13 +0000 (19:40 +0100)
commit241738bd51cb0efe58e6c570223153e970afe3ae
tree05263e1ec3fbd58cc4ba5ee69163612fbb769a4a
parentbdf20507da11a9a5b32ef04fa09f352828189aef
parentce8f0d0607bcad3ec0e8599be80353204427093e
Merge branch 'mips-next' of dev.phrozen.org/githttp/mips-next into mips-for-linux-next
arch/mips/Kconfig
arch/mips/lantiq/xway/dma.c
arch/mips/mm/c-r4k.c
arch/mips/mm/tlbex.c
arch/mips/oprofile/Makefile
arch/mips/oprofile/common.c