diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 19:31:26 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 19:31:26 +0200 |
commit | dd0888c264c0d5feb5d86eb69c1fdbcdb42566af (patch) | |
tree | d224f6e96bc29b9a9dc3b2f60cb2f8808d41844e /tools/perf/perf.h | |
parent | Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux (diff) | |
parent | mfd: fix pcap adc locking (diff) | |
download | linux-dd0888c264c0d5feb5d86eb69c1fdbcdb42566af.tar.xz linux-dd0888c264c0d5feb5d86eb69c1fdbcdb42566af.zip |
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
Diffstat (limited to 'tools/perf/perf.h')
0 files changed, 0 insertions, 0 deletions