| commit | 2dde3bccbf905548a17b8d440053f86454af54a9 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Mon Nov 03 17:45:36 2014 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Mon Nov 03 17:45:36 2014 -0800 |
| tree | e25ebd532def85307fc231710b6660c93565d55f | |
| parent | 8f5951172b6dbda75a9cdf5990650e1cf8b1dd22 [diff] | |
| parent | 8bf9be566ed5790003402eb1060184956788b410 [diff] |
Merge branch 'for-v3.19/gpmc-omap' of github.com:rogerq/linux into omap-for-v3.19/gpmc Conflicts: arch/arm/mach-omap2/gpmc.c