Merge branch 'next-s5pv210' into for-next-new

Browse source

Conflicts:
	arch/arm/mach-s5pv210/mach-smdkv210.c

...

This commit is contained in:

Kukjin Kim 2010-12-30 10:52:32 +09:00

parent 5ed76f3d98 8f49720d5a

commit 0ae9a22b45

2 changed files with 79 additions and 4 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

2

arch/arm/mach-s5pv210/Kconfig

View file

81

arch/arm/mach-s5pv210/mach-smdkv210.c

View file