tree 5de2d2da53d138056b2e61b11629ae52d1710289
parent 932088b136c3aeace052cc23179f54022ce3f723
parent d801cec70d69d2d4121e133edd5c3237fe0e0078
author Linus Torvalds <torvalds@linux-foundation.org> 1236798844 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1236798844 -0700

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  radeonfb/aty128fb: Disable broken early resume hook for PowerBooks
  hvc_console: Remove tty->low_latency on pseries backends
  powerpc: fix linkstation and storcenter compilation breakage
  powerpc/4xx: Enable SERIAL_OF support by default for Virtex platforms