]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Dec 2008 19:32:24 +0000 (11:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Dec 2008 19:32:24 +0000 (11:32 -0800)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
  powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia


Trivial merge