Merge branch 'misc' into for-linus

Conflicts: arch/arm/mach-integrator/integrator_ap.c
2011-10-25 08:19:59 +01:00
Parent 06afb1a087 eb0474544b
--- a/arch/arm/mach-rpc/Makefile.boot
+++ b/arch/arm/mach-rpc/Makefile.boot
@@ -1,4 +1,4 @@
-   zreladdr-y	:= 0x10008000
+   zreladdr-y	+= 0x10008000
 params_phys-y	:= 0x10000100
 initrd_phys-y	:= 0x18000000