Merge branch 'ux500/asic-id' into next/soc

Browse source

* ux500/asic-id:
  ARM: ux500: Correct Ux500 family names usage

...

This commit is contained in:

Olof Johansson 2012-09-04 21:38:56 -07:00

parent c127036391 79964bcd79

commit daa56a06b5

3 changed files with 3 additions and 3 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-ux500/clock.c

View file

2

arch/arm/mach-ux500/platsmp.c

View file

2

arch/arm/mach-ux500/timer.c

View file