tree 4f1dadd2c53df8d38d779381ecb91dfc7eb8a3a8
parent 68b32d4499fd910b85b263c3afe92687d18abc3f
parent 9f3eefc4f9b02404e89d624a6cd40e7b468b5fd5
author Linus Torvalds <torvalds@linux-foundation.org> 1229196744 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229196744 -0800

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