]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 31 May 2010 00:01:50 +0000 (10:01 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 31 May 2010 00:01:50 +0000 (10:01 +1000)
commit4cd960b7cb632c8877ec351ab9f8d070c2ded01d
tree6539480b50258f30af799a6ab38529d7b2d7e538
parent9ab134069d9015dea481514072ae9c613dd0fe1d
parent1e069050889dd293dc1a3ce31c272bfddbbe9357
Merge commit 'kumar/next' into next

Conflicts:
arch/powerpc/sysdev/fsl_msi.c
arch/powerpc/Kconfig
arch/powerpc/kernel/traps.c
arch/powerpc/sysdev/fsl_msi.c