summaryrefslogtreecommitdiffstats
path: root/tools/perf/perf.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-04 19:31:26 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-04 19:31:26 +0200
commitdd0888c264c0d5feb5d86eb69c1fdbcdb42566af (patch)
treed224f6e96bc29b9a9dc3b2f60cb2f8808d41844e /tools/perf/perf.h
parentMerge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux (diff)
parentmfd: fix pcap adc locking (diff)
downloadlinux-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