diff options
author | Tony Lindgren <tony@atomide.com> | 2012-05-09 20:58:42 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 20:58:42 +0400 |
commit | bfd17879866b36e95c58721da070d9f2ac7f8901 (patch) | |
tree | 2381206a25ba7d664f4b787321ca5ce253e6a22c /arch/arm/mach-omap1/time.c | |
parent | 743a6d923f803c861a24d173e1d1818ca8ac0384 (diff) | |
parent | 414e41286e3aeb87de140ef4c75100f9344c32b2 (diff) | |
download | linux-bfd17879866b36e95c58721da070d9f2ac7f8901.tar.xz |
Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data
Some OMAP IP block data additions for 3.5, along with a
fix for a longstanding watchdog timer integration problem.
Diffstat (limited to 'arch/arm/mach-omap1/time.c')
0 files changed, 0 insertions, 0 deletions