Merge branch 'dev-dt-timer' of github.com:jonhunter/linux into omap-for-v3.8/dt

Browse source

...

This commit is contained in:

Tony Lindgren 2012-11-06 16:09:51 -08:00

parent ad3252556f 9883f7c8dd

commit 2580390c56

4 changed files with 275 additions and 39 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

17

arch/arm/mach-omap2/board-generic.c

View file

201

arch/arm/mach-omap2/timer.c

View file

93

arch/arm/plat-omap/dmtimer.c

View file

1

arch/arm/plat-omap/include/plat/dmtimer.h

View file