| commit | 8b5fd8516cfdd187f35c45f5f818da94aa3b42e9 | [log] [tgz] |
|---|---|---|
| author | Samuel Ortiz <sameo@linux.intel.com> | Mon Apr 08 11:19:40 2013 +0200 |
| committer | Samuel Ortiz <sameo@linux.intel.com> | Mon Apr 08 11:20:34 2013 +0200 |
| tree | 5a2d4a3143f3573aafa2fa180991485e45ac5f8e | |
| parent | 9d66b568a215fe2da2a9db736ebf9b8d66082d88 [diff] | |
| parent | b09f86dbfc20d9420dac43dba016cb65b582c983 [diff] |
Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0-ux500 Conflicts: drivers/mfd/ab8500-gpadc.c Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>