aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 18:51:36 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 18:51:36 -0800
commitd9405057c18cdc62eade7106a774d87a3e080875 (patch)
treeba3567e949789f8459ea4d79699a5bc831b97abc /sound
parentMerge ../linus (diff)
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff)
downloadlinux-dev-d9405057c18cdc62eade7106a774d87a3e080875.tar.xz
linux-dev-d9405057c18cdc62eade7106a774d87a3e080875.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] pcwd_usb.c generic HID include file [WATCHDOG] watchdog miscdevice patch [WATCHDOG] rm9k_wdt: fix interrupt handler arguments [WATCHDOG] rm9k_wdt: fix compilation
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions