diff options
| author |   Tony Lindgren <tony@atomide.com> | 2012-05-10 09:39:05 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-10 09:39:05 -0700 |
| commit | 640ec79d6d8c10ceb254c269a1f7fd9cb47ea655 (patch) | |
| tree | e13bf414bc1a9c2e35889441b93443865e2eb14c /include | |
| parent | Merge branch 'devel-hwmod' into cleanup (diff) | |
| parent | Merge branch 'for_3.5/omap_misc_cleanup' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into cleanup-soc (diff) | |
Merge branch 'cleanup-soc' into cleanup
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions