Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79...
authorRalf Baechle <ralf@linux-mips.org>
Sat, 26 May 2012 18:55:48 +0000 (19:55 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 26 May 2012 18:55:48 +0000 (19:55 +0100)
commitc819baf31f5f91fbb06b2c93de2d5b8c8d096f3f
treef42e91e56894b07555f0137b60e81c5e7505c4f4
parent442209f31dafef9fde852858e1ce566b675b720d
parent39faa24688a0574bf2f89e1a0702c176f99bad1f
parenta3c8b4faeeccb33dbad6969bc9e50bf409f167e7
parentbaab01b26685b8f0af9092aaee73d8a70c31e55c
parent9598111f49ade848aa44f431ee81a42a000c8b3c
parent009d6914f14d6c12a073e9ff8506a53047c308e7
Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next
arch/mips/Kconfig
arch/mips/kernel/traps.c
arch/mips/pci/Makefile