Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 18:55:19 +0000 (11:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 18:55:19 +0000 (11:55 -0700)
commitf32c23f59a3af0c5bb9e198386f2e6cd22038e9f
tree24b80055498bb88cceba49f7d6c885cca4d5b0e5
parente899536470ec83f2792092640148f2488961731b
parent65ba6cdc837af9b77354d03987354196ac4eb308
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Clear sub-page HPTE present bits when demoting page size
  [POWERPC] 4xx: Clear new TLB cache attribute bits in Data Storage vector