Merge branch 'ux500/devel' into next/devel

Browse source

...

This commit is contained in:

Olof Johansson 2011-12-13 12:18:29 -08:00

parent 0fe422c9bd 017beaa63b

commit 1dc9fff73b

3 changed files with 89 additions and 14 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

38

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

View file

2

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

View file

63

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

View file