Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
commitdd0888c264c0d5feb5d86eb69c1fdbcdb42566af
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2009 17:31:26 +0000 (4 10:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2009 17:31:26 +0000 (4 10:31 -0700)
treed224f6e96bc29b9a9dc3b2f60cb2f8808d41844e
parent14c1b7c212de7c7c9231d5a676eb96f28c088338
parent1c90ea2c7eb3b24a07a2f82164323588fb029bc1
Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: fix pcap adc locking
  mfd: sm501, fix lock imbalance