From: Linus Torvalds Date: Sat, 13 Dec 2008 19:32:24 +0000 (-0800) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx X-Git-Tag: v2.6.28-rc9~28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5279585ff2bedc8180da5bdf8aa3ff1736466de2;p=linux-2.6-omap-h63xx.git Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx: powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia --- 5279585ff2bedc8180da5bdf8aa3ff1736466de2