Merge branch 'rmobile/core' into rmobile/marzen

Browse source

...

This commit is contained in:

Paul Mundt 2012-01-10 13:16:37 +09:00

parent 916b1f8c81 1229835ccb

commit ea75b9c127

4 changed files with 38 additions and 2 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-shmobile/headsmp.S

View file

32

arch/arm/mach-shmobile/hotplug.c

View file

1

arch/arm/mach-shmobile/include/mach/common.h

View file

5

arch/arm/mach-shmobile/platsmp.c

View file