Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2008 22:58:56 +0000 (14:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2008 22:58:56 +0000 (14:58 -0800)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  powerpc: Fix corruption error in rh_alloc_fixed()
  powerpc/fsl-booke: Fix the miss interrupt restore


Trivial merge