Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit0343a7e46a9544b96fcb0978520b0f8c8c6279f6
authorRalf Baechle <ralf@linux-mips.org>
Sat, 28 Mar 2009 22:45:26 +0000 (28 23:45 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 28 Mar 2009 22:45:26 +0000 (28 23:45 +0100)
tree11b64c5b76c853a590f6eeb970f1268d1cc93cd0
parentfb33d3080626f100fe0a3447c497047789ee7f07
parent07d43ba98621f08e252a48c96b258b4d572b0257
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
Makefile
arch/mips/kernel/smtc.c
arch/mips/sibyte/bcm1480/smp.c