summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2013-09-061-1/+2
|\
| * ARM: DRA7: Resue the clocksource, clockevent supportR Sricharan2013-08-131-1/+2
* | Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-09-061-3/+3
|\ \
| * | ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=nStephen Boyd2013-08-021-0/+7
| * | Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/...Olof Johansson2013-07-241-7/+0
| |\ \ | | |/ | |/|
| | * ARM: OMAP2+: Divorce from local timer APIStephen Boyd2013-06-251-7/+0
* | | ARM: OMAP2+: fix wrong address when loading PRM_FRAC_INCREMENTOR_DENUMERATOR_...Chen Baozi2013-08-211-1/+1
|/ /
* | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2013-07-141-1/+1
|\ \
| * | ARM: OMAP2+: timer: initialize before using oh_nameAfzal Mohammed2013-07-041-1/+1
* | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2013-07-061-1/+1
|\ \ \ | |/ / |/| / | |/
| * sched_clock: Make ARM's sched_clock generic for all architecturesStephen Boyd2013-06-121-1/+1
* | ARM: OMAP2+: AM43x: basic dt supportAfzal Mohammed2013-06-131-1/+1
|/
* arm: fix mismerge of arch/arm/mach-omap2/timer.cLinus Torvalds2013-05-081-0/+4
* Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-05-071-6/+1
|\
| * Merge branch 'late/clksrc' into late/cleanupArnd Bergmann2013-05-061-68/+65
| |\
| | * ARM: OMAP: remove unused variableArnd Bergmann2013-04-231-3/+1
| | * Merge tag 'clksrc-cleanup-for-3.10-part2' of git://sources.calxeda.com/kernel...Olof Johansson2013-04-171-4/+1
| | |\
| | | * ARM: convert arm/arm64 arch timer to use CLKSRC_OF initRob Herring2013-04-111-4/+1
| * | | Merge branch 'omap/fixes-non-critical' into late/cleanupOlof Johansson2013-04-191-2/+3
| |\ \ \
* | \ \ \ Merge tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2013-05-071-1/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'late/dt' into next/dt2Arnd Bergmann2013-05-061-0/+4
| |\| | |
| | * | | ARM: OMAP: clocks: Delay clk inits atleast until slab is initializedRajendra Nayak2013-03-271-0/+4
| * | | | Merge tag 'omap-for-v3.10/dt-signed-v2' of git://git.kernel.org/pub/scm/linux...Olof Johansson2013-04-111-1/+6
| |\ \ \ \
| | * | | | ARM: dts: OMAP2+: Update DMTIMER compatibility propertyJon Hunter2013-04-091-1/+6
| | |/ / /
| * | | | Merge branch 'omap/fixes-non-critical' into next/dt2Olof Johansson2013-04-111-2/+3
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
* | | | Merge tag 'omap-for-v3.10/timer-signed' of git://git.kernel.org/pub/scm/linux...Arnd Bergmann2013-04-081-60/+63
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into ...Tony Lindgren2013-04-031-61/+63
| |\ \ \
| | * | | ARM: OMAP4+: Fix sparse warning in system timersJon Hunter2013-04-011-2/+2
| | * | | ARM: OMAP2+: Store ID of system timers in timer structureJon Hunter2013-04-011-5/+6
| | * | | ARM: OMAP3: Update clocksource timer selectionJon Hunter2013-04-011-12/+21
| | * | | ARM: OMAP2+: Simplify system timers definitionsJon Hunter2013-04-011-9/+8
| | * | | ARM: OMAP2+: Simplify system timer clock definitionsJon Hunter2013-04-011-23/+14
| | * | | ARM: OMAP2+: Remove hard-coded test on timer IDJon Hunter2013-04-011-13/+14
| | * | | ARM: OMAP2+: Display correct system timer nameJon Hunter2013-04-011-11/+13
| | * | | Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v...Jon Hunter2013-04-011-17/+5
| | |\ \ \
| * | | | | Merge commit '7185684' into omap-for-v3.10/timerTony Lindgren2013-04-031-1/+1
| |\| | | | | | |_|/ / | |/| | |
| | * | | ARM: OMAP: use consistent error checkingRussell King2013-03-131-1/+1
| * | | | ARM: OMAP5: timer: Update the clocksource name as per clock dataSantosh Shilimkar2013-03-191-2/+3
| | |_|/ | |/| |
* / | | ARM: smp_twd: convert to use CLKSRC_OF initRob Herring2013-03-111-1/+1
|/ / /
* | | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-221-2/+1
|\ \ \
| * \ \ Merge tag 'omap-for-v3.9/pm-signed' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2013-02-051-2/+1
| |\ \ \
| | * | | ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device codePaul Walmsley2013-01-261-2/+1
| | |/ /
| * | | Merge tag 'v3.8-rc6' into next/socOlof Johansson2013-02-051-6/+2
| |\| |
* | | | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2013-02-221-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatformArnd Bergmann2013-02-151-6/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | ARM: OMAP2+: Use omap initcallsTony Lindgren2013-01-111-1/+1
* | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-211-27/+8
|\ \ \ \ \
| * \ \ \ \ Merge tag 'v3.8-rc5' into next/cleanupOlof Johansson2013-01-281-6/+2
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| * | | | Merge branch 'clocksource/cleanup' into next/cleanupOlof Johansson2013-01-141-10/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | ARM: use clockevents_config_and_register() where possibleShawn Guo2013-01-141-10/+3
| | | |/ | | |/|