diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-03 19:47:59 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-03 19:47:59 +0200 |
| commit | 7f585bbfc54fec9dcf387fd2edb2d6f4908badf8 (patch) | |
| tree | fd79064e390217a56f77c5cd8236c0db6f8d9528 /CREDITS | |
| parent | Merge commit '7185684' into omap-for-v3.10/timer (diff) | |
| parent | ARM: OMAP4+: Fix sparse warning in system timers (diff) | |
| download | linux-7f585bbfc54fec9dcf387fd2edb2d6f4908badf8.tar.xz linux-7f585bbfc54fec9dcf387fd2edb2d6f4908badf8.zip | |
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer
Conflicts:
arch/arm/mach-omap2/timer.c
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions