Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Dec 2008 00:25:19 +0000 (16:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Dec 2008 00:25:19 +0000 (16:25 -0800)
commitcefb3d02cad6fae49369cdde24526c4c4806b20f
tree8d2f8f075d0f63a7425bda781e8a15caf97f876a
parentae8d04e2ecbb233926860e9ce145eac19c7835dc
parente5e774d8833de1a0037be2384efccadf16935675
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/fsl-booke: Fix problem with _tlbil_va being interrupted