diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-23 12:06:28 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-23 12:06:28 -0800 |
| commit | 7cab8713b1ed0dab08ad6458f92a40b7ff4be619 (patch) | |
| tree | 8c95691ac2b5bdfc85efe417427b5903fa80450c /arch/arm/plat-omap/include/plat/dmtimer.h | |
| parent | c3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 (diff) | |
| parent | d5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6 (diff) | |
| download | talos-op-linux-7cab8713b1ed0dab08ad6458f92a40b7ff4be619.tar.gz talos-op-linux-7cab8713b1ed0dab08ad6458f92a40b7ff4be619.zip | |
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
Diffstat (limited to 'arch/arm/plat-omap/include/plat/dmtimer.h')
0 files changed, 0 insertions, 0 deletions
