Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit074799fdb407ada502ed3afdc23b440b91e8d580
authorRalf Baechle <ralf@linux-mips.org>
Fri, 15 Feb 2008 15:35:33 +0000 (15 15:35 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 15 Feb 2008 15:35:33 +0000 (15 15:35 +0000)
tree95f08864713ff0931f8cbd8deda7622af07bfde1
parent73b46f1267d3ae735b8b45e0e09a13f8bd148422
parent4ee29f6a52158cea526b16a44ae38643946103ec
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
arch/mips/kernel/sysirix.c