| commit | bbeb0af25f493261c15ceee176c99b7fd6fd5479 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 30 19:06:25 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 30 19:06:25 2012 -0700 |
| tree | 7aad604d29719619573d16715e6cc5209de3eb46 | |
| parent | 6df419e45d71b8d9a0de8e92a1212bbea460f0e0 [diff] | |
| parent | 938e05bf131334804e08ec4fcd381edfd2d699f6 [diff] |
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