summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-19 08:00:50 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-11-19 08:00:50 (GMT)
commit6d5b43a67accf6793ed259f6534b4bd53b1e5696 (patch)
treeb22f2b7dc929b523faf63d2734d8b22b5fd4a843 /sound/oss
parent641d2f63cfe24539e154efa2f932937934c27dde (diff)
parent32464779a1b8c15e9aa9aa0306b2f735080df9d8 (diff)
downloadlinux-fsl-qoriq-6d5b43a67accf6793ed259f6534b4bd53b1e5696.tar.xz
Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions