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)
commit09f3eca2b7e2762e223fdd359f9d0f6303a85f6c
tree03ba6cd7357ba1054f874b12db44b838806e316d
parente1b7361f32fdf60f575566ddef8a36b33086631d
parentbee86f14d51a5a9a3b1897e301da1e415df0ba23
Merge branch 'for-2.6.24' of git://git./linux/kernel/git/galak/powerpc

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