projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6df419e 938e05b)
Merge tag 'mfd-for-linus-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jul 2012 02:06:25 +0000 (19:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jul 2012 02:06:25 +0000 (19:06 -0700)
commitbbeb0af25f493261c15ceee176c99b7fd6fd5479
tree7aad604d29719619573d16715e6cc5209de3eb46tree | snapshot
parent6df419e45d71b8d9a0de8e92a1212bbea460f0e0commit | diff
parent938e05bf131334804e08ec4fcd381edfd2d699f6commit | diff
Merge tag 'mfd-for-linus-3.6-1' of git://git./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
Domain: System / Kernel;