projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6df419e
938e05b
)
Merge tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 31 Jul 2012 02:06:25 +0000
(19:06 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 31 Jul 2012 02:06:25 +0000
(19:06 -0700)
Pull MFD fix from Samuel Ortiz:
"This one fixes an s5m8767 regulator build breakage due to a merge
conflict caused by the MFD s5m API changes."
* tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
regulator: Fix an s5m8767 build failure
Trivial merge