Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Feb 2010 18:10:18 +0000 (10:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Feb 2010 18:10:18 +0000 (10:10 -0800)
commit9d2bc1a4ccc0da617bab6bba3278705e894365ca
tree9e31c23dd4802b18cabef125b06d3748b8751171
parent8bd73803e18354add19b050d05770b646ecbffd0
parent36350e00696df148507246c817cf6f86329479fd
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/pseries: Fix kexec regression caused by CPPR tracking