Merge branch 'ux500/fixes-3.5' into next/dt

Browse source

prerequisite for ux500/dt branch

...

This commit is contained in:

Arnd Bergmann 2012-07-17 23:33:22 +02:00

parent 5d74c8a065 2b667a2d80

commit a89e14edd2

3 changed files with 12 additions and 9 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

12

arch/arm/mach-ux500/board-mop500.c

View file

2

arch/arm/mach-ux500/timer.c

View file

7

drivers/of/platform.c

View file