From: Linus Torvalds Date: Sat, 26 Jul 2008 00:34:00 +0000 (-0700) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e89f38218ff6de09983bd8769ec0cdf6e70d9e8e;p=openwrt%2Fstaging%2Fblogic.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: powerpc: Fix boot problem due to AT_BASE_PLATFORM change --- e89f38218ff6de09983bd8769ec0cdf6e70d9e8e