summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-11 22:46:46 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-11 22:46:46 +0100
commitd0c4c9d4a2e46f052178806c4004d52cd3ae040f (patch)
tree648f09c93d8aab711ba9aa9f3cb424462a5b6222 /fs
parentMerge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 (diff)
parentV4L/DVB (7001): av7110: fix section mismatch (diff)
downloadlinux-d0c4c9d4a2e46f052178806c4004d52cd3ae040f.tar.xz
linux-d0c4c9d4a2e46f052178806c4004d52cd3ae040f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (7001): av7110: fix section mismatch V4L/DVB (6999): ivtv: stick to udelay=10 after all
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions