git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cf3966b 191aee5)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:42:43 +0000 (13:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:42:43 +0000 (13:42 -0700)
commit95c46afe6034d15bdf0f95d69f25489cecad9a47
treea3bff5de25890f6de94cbf431bb0f94073893507tree | snapshot
parentcf3966bf6ecfe25a75d625771e327b84878bc09dcommit | diff
parent191aee58b6568cf8143901bfa3f57a9b8faa6f1ccommit | diff
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Remove IOMMU_VMERGE config option
  powerpc: Fix swiotlb to respect the boot option
  powerpc: Do not call prink when CONFIG_PRINTK is not defined
  powerpc: Use correct ccr bit for syscall error status
  powerpc/fsl-booke: Get coherent bit from PTE
  powerpc/85xx: Make sure lwarx hint isn't set on ppc32
Pandora Kernel Repository