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)
commit5279585ff2bedc8180da5bdf8aa3ff1736466de2
tree4f1dadd2c53df8d38d779381ecb91dfc7eb8a3a8
parent68b32d4499fd910b85b263c3afe92687d18abc3f
parent9f3eefc4f9b02404e89d624a6cd40e7b468b5fd5
Merge branch 'merge' of git://git./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