diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-23 12:04:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-23 12:04:39 +1100 |
| commit | e1dbb13e75fb314abc1afca5eb4a43749118b6f6 (patch) | |
| tree | 7c5f0f4c6094c70f42c3198f729120fcfb59f2ff /arch/arm/mach-omap2/board-omap4panda.c | |
| parent | f346baeb45b98f513f4036fd77e22a157563235c (diff) | |
| parent | 358020dd27b0818eeeb998dba9899426805e2342 (diff) | |
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-mxs/mach-mx28evk.c
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
0 files changed, 0 insertions, 0 deletions