diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-28 16:47:01 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 16:47:01 +0400 |
| commit | 472fd5401561f94698f4c8f9dbbbfbf76ab55626 (patch) | |
| tree | 2b026da522975ca03bfcdd80b66bb266ed6553a9 /CREDITS | |
| parent | 5f6129675bf17aeda5385830c446b91899cb6812 (diff) | |
| parent | 19f3a98d82cabdff5a1a437811d472ef52f34954 (diff) | |
| download | linux-472fd5401561f94698f4c8f9dbbbfbf76ab55626.tar.xz | |
Merge branch 'cleanup-hwmod' into cleanup
Conflicts:
arch/arm/mach-omap2/dsp.c
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions