Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer

Browse source

Conflicts:
	arch/arm/mach-omap2/timer.c

...

This commit is contained in:

Tony Lindgren 2013-04-03 10:47:59 -07:00

parent 43231b5be6 4615943cf3

commit 7f585bbfc5

4 changed files with 66 additions and 65 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-omap2/board-cm-t3517.c

View file

2

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

View file

3

arch/arm/mach-omap2/common.h

View file

122

arch/arm/mach-omap2/timer.c

View file