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)
commita52519f2ce180890069fa7b1a92fa51d4448a0ba
treecae6d87adcba8ee831f9a50f3cff467254861718
parent1bda71282ded6a2e09a2db7c8884542fb46bfd4f
parentaf4d3643864ee5fcba0c97d77a424fa0b0346f8e
Merge branch 'merge' of git://git./linux/kernel/git/galak/powerpc

* '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