tree d11b9f40044951128c9151b0fd88c13066dfec31
parent 6f58d79598c184dc4f18ceddfaa5fa7483bce0a5
parent 7ea6fd7e2df041297298b5feb5b7b78a2b1a5310
author Linus Torvalds <torvalds@linux-foundation.org> 1206389374 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1206389374 -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] Fix Oops with TQM5200 on TQM5200
  [POWERPC] mpc5200: Fix null dereference if bestcomm fails to initialize
  [POWERPC] mpc5200-fec: Fix possible NULL dereference in mdio driver
  [POWERPC] Fix crash in init_ipic_sysfs on efika
  [POWERPC] Don't use 64k pages for ioremap on pSeries