Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
This commit is contained in:
Linus Torvalds 2009-07-04 10:31:26 -07:00
commit dd0888c264
2 changed files with 5 additions and 2 deletions