summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-10 06:05:34 (GMT)
committerIngo Molnar <mingo@elte.hu>2010-09-10 06:05:34 (GMT)
commit9efdda310cb26bdc28429cb831c3ec5fa270feb7 (patch)
tree7d544a56502b8b943a1cba667805bde0200063da /sound/oss
parente1d4e08d1fa302f877d9a26d8ce056734b46ca14 (diff)
parentdf09162550fbb53354f0c88e85b5d0e6129ee9cc (diff)
downloadlinux-9efdda310cb26bdc28429cb831c3ec5fa270feb7.tar.xz
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions