Merge branch 'misc' into for-linus

Conflicts:
	arch/arm/mach-integrator/integrator_ap.c
This commit is contained in:
Russell King
2011-10-25 08:19:59 +01:00
146 changed files with 787 additions and 539 deletions

View File

@@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00C00000