Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into next/timer

Browse source

* 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms:
  ARM: ux500: fix compilation after local timer rework

...

This commit is contained in:

Arnd Bergmann 2012-03-15 13:45:53 +00:00

parent 648ab3df21 218a280141

commit c0206e228e

1 changed files with 1 additions and 1 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/timer.c

View file