Merge branch 'lpc32xx/fixup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into lpc32xx/tmp

Browse source

...

This commit is contained in:

Roland Stigge 2012-03-13 21:14:01 +01:00

parent bb200029fc cfac337b0f

commit 73d43d0064

3 changed files with 52 additions and 49 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

51

arch/arm/mach-lpc32xx/include/mach/platform.h

View file

2

arch/arm/mach-lpc32xx/pm.c

View file

46

arch/arm/mach-lpc32xx/timer.c

View file