From: Linus Torvalds Date: Wed, 11 Mar 2009 19:14:04 +0000 (-0700) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc X-Git-Tag: firefly_0821_release~15337 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01f675029dfdcbd83b451bff4138de0d43752c4a;p=firefly-linux-kernel-4.4.55.git Merge branch 'merge' of git://git./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 --- 01f675029dfdcbd83b451bff4138de0d43752c4a