diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 19:06:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 19:06:25 -0700 |
commit | bbeb0af25f493261c15ceee176c99b7fd6fd5479 (patch) | |
tree | 7aad604d29719619573d16715e6cc5209de3eb46 /arch/powerpc/platforms/powernv/pci-ioda.c | |
parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
parent | regulator: Fix an s5m8767 build failure (diff) | |
download | linux-dev-bbeb0af25f493261c15ceee176c99b7fd6fd5479.tar.xz linux-dev-bbeb0af25f493261c15ceee176c99b7fd6fd5479.zip |
Merge tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions