Please pull 'merge' branch of 4xx tree

[Josh Boyer]

Hi Paul,

I have one more small fix for 2.6.28 in my merge branch.  It fixes
an assembler error with some toolchains, notably ELDK.  I've CC'd
Linus in case you don't have anything else pending at the moment.

josh

The following changes since commit ab44f4627e2160cddbddbe8aa8b1d2b2e1559790:
  Paul Mackerras (1):
        Merge branch 'merge' of master.kernel.org:/.../galak/powerpc into merge

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git merge

Josh Boyer (1):
      powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia

 arch/powerpc/boot/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)