tree 95936f702b4c21ce30679342643da2ebf1a9f7f3
parent 13beadd91f148933f47947a88ab2c97a1ca9768d
parent d8f48457d5af6601abdecaad7a95c45bfeef90d5
author Linus Torvalds <torvalds@linux-foundation.org> 1240959332 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1240959332 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc/ps3: Fix build error on UP
  powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB
  powerpc: ppc32 needs elf_read_implies_exec()
  powerpc/86xx: Add device_type entry to soc for ppc9a
  powerpc/44x: Correct memory size calculation for denali-based boards
  maintainers: Fix PowerPC 4xx git tree
  powerpc: fix for long standing bug noticed by gcc 4.4.0
  Revert "powerpc: Add support for early tlbilx opcode"