aboutsummaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2009-06-23 10:41:17 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2009-06-23 10:41:17 -0700
commitcf9c1b92ae62ce71a8e861f02476724348defc6a (patch)
tree433d77497f909eea2c35b7afff24de9f86212221 /sound/pci
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff)
parent[WATCHDOG] wdt_pci.c: remove #ifdef CONFIG_WDT_501_PCI (diff)
downloadlinux-cf9c1b92ae62ce71a8e861f02476724348defc6a.tar.gz
linux-cf9c1b92ae62ce71a8e861f02476724348defc6a.tar.bz2
linux-cf9c1b92ae62ce71a8e861f02476724348defc6a.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] wdt_pci.c: remove #ifdef CONFIG_WDT_501_PCI [WATCHDOG] hpwdt: Add NMI priority option [WATCHDOG] OMAP fixes: enable clock in probe, trigger timer reload [WATCHDOG] add bcm47xx watchdog driver [WATCHDOG] Freescale STMP: watchdog driver [WATCHDOG] twl4030 watchdog driver [WATCHDOG] U300 COH 901 327 watchdog driver [WATCHDOG] Add pnx833x_wdt
Diffstat (limited to 'sound/pci')
0 files changed, 0 insertions, 0 deletions