| commit | dd0888c264c0d5feb5d86eb69c1fdbcdb42566af | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 04 10:31:26 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 04 10:31:26 2009 -0700 |
| tree | d224f6e96bc29b9a9dc3b2f60cb2f8808d41844e | |
| parent | 14c1b7c212de7c7c9231d5a676eb96f28c088338 [diff] | |
| parent | 1c90ea2c7eb3b24a07a2f82164323588fb029bc1 [diff] |
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