projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d66b56 b09f86d)
Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0...
authorSamuel Ortiz <sameo@linux.intel.com>
Mon, 8 Apr 2013 09:19:40 +0000 (11:19 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 8 Apr 2013 09:20:34 +0000 (11:20 +0200)
commit8b5fd8516cfdd187f35c45f5f818da94aa3b42e9
tree5a2d4a3143f3573aafa2fa180991485e45ac5f8etree | snapshot
parent9d66b568a215fe2da2a9db736ebf9b8d66082d88commit | diff
parentb09f86dbfc20d9420dac43dba016cb65b582c983commit | 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>
drivers/mfd/ab8500-gpadc.c diff1 | diff2 | blob | history
Domain: System / Kernel;