Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commite1c8959ef7d9a6a26d7a9dc0411e7dc2ef13ca60
authorRalf Baechle <ralf@linux-mips.org>
Wed, 27 Jul 2011 07:35:27 +0000 (27 08:35 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 27 Jul 2011 07:35:27 +0000 (27 08:35 +0100)
tree1d4a4d203486ca3030206f03a17917a7e30233e4
parentc72e978c09648a96b2b8e116f2ffa2a85a724bf1
parente371d46ae45488bcb112a99a7de462e9e3aa6764
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
arch/mips/mm/c-r4k.c