Merge branch 'for-2.6.24' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Dec 2007 20:27:09 +0000 (12:27 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Dec 2007 20:27:09 +0000 (12:27 -0800)
* 'for-2.6.24' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  [POWERPC] Fix swapper_pg_dir size when CONFIG_PTE_64BIT=y on FSL_BOOKE


Trivial merge