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)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  powerpc/fsl-booke: Fix problem with _tlbil_va being interrupted


Trivial merge