Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git] / arch / arm / mach-shark / Makefile.boot
1    zreladdr-y   += 0x08008000
2