Merge branch 'next/generic' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Wed, 11 Jan 2012 14:41:47 +0000 (15:41 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 11 Jan 2012 14:41:47 +0000 (15:41 +0100)
commit39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f
tree89355f4ae7bbb874537bb65f71ba0d19b3d468e1
parent5b0ec2efb7d373faa7b1a7632c459b93895d45cd
parentd7a887a73dec6c387b02a966a71aac767bbd9ce6
Merge branch 'next/generic' into mips-for-linux-next
arch/mips/cavium-octeon/setup.c
arch/mips/include/asm/pgtable-32.h
arch/mips/jazz/irq.c
arch/mips/kernel/smtc.c
arch/mips/lantiq/irq.c
arch/mips/mm/tlb-r4k.c
arch/mips/sgi-ip27/ip27-irq.c