git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d66b56
b09f86d
)
Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0...
author
Samuel Ortiz
<sameo@linux.intel.com>
Mon, 8 Apr 2013 09:19:40 +0000
(11:19 +0200)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Mon, 8 Apr 2013 09:20:34 +0000
(11:20 +0200)
Conflicts:
drivers/mfd/ab8500-gpadc.c
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff