summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 00:21:40 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 00:21:40 +0100
commitd1ffa5669cd834f901141756e63195f48c1bfbf9 (patch)
treef0bed266c1f3fef528bbced56b48aac63e0a26b1 /sound
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[PATCH] ocfs2: don't wait on recovery when locking journal (diff)
downloadlinux-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.xz
linux-d1ffa5669cd834f901141756e63195f48c1bfbf9.zip
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions