Merge branch 'misc' into for-linus
Conflicts: arch/arm/mach-integrator/integrator_ap.c
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
zreladdr-y := 0x00008000
|
||||
zreladdr-y += 0x00008000
|
||||
params_phys-y := 0x00000100
|
||||
initrd_phys-y := 0x00C00000
|
||||
|
Reference in New Issue
Block a user