diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-28 05:47:01 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 05:47:01 -0700 |
| commit | 472fd5401561f94698f4c8f9dbbbfbf76ab55626 (patch) | |
| tree | 2b026da522975ca03bfcdd80b66bb266ed6553a9 /scripts/patch-kernel | |
| parent | Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup (diff) | |
| parent | Merge tag 'omap-cleanup-a-for-3.6' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-472fd5401561f94698f4c8f9dbbbfbf76ab55626.tar.gz linux-472fd5401561f94698f4c8f9dbbbfbf76ab55626.zip | |
Merge branch 'cleanup-hwmod' into cleanup
Conflicts:
arch/arm/mach-omap2/dsp.c
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions