Merge branch 'smp' into misc

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
This commit is contained in:
Russell King 2011-01-06 22:31:35 +00:00
commit 4ec3eb1363
1391 changed files with 25581 additions and 12331 deletions

View file

@ -26,6 +26,7 @@ obj-$(CONFIG_REGULATOR) += regulator/
# char/ comes before serial/ etc so that the VT console is the boot-time
# default.
obj-y += tty/
obj-y += char/
# gpu/ comes after char for AGP vs DRM startup