Merge branch 'next-samsung-board-v3.1' into next-samsung-board

Browse source

Conflicts:
	arch/arm/mach-exynos4/Kconfig

...

This commit is contained in:

Kukjin Kim 2011-09-16 17:13:09 +09:00

parent be4ab36168 699efdd2d3

commit 2520123382

4 changed files with 120 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/configs/exynos4_defconfig

View file

10

arch/arm/mach-exynos4/Kconfig

View file

1

arch/arm/mach-exynos4/Makefile

View file

108

arch/arm/mach-exynos4/mach-origen.c

View file