aboutsummaryrefslogtreecommitdiff
path: root/sound/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds2005-09-05 06:00:45 -0700
committerLinus Torvalds2005-09-05 06:00:45 -0700
commit67d2c36e901403bb97cb79ddb44d702c3284d0ba (patch)
tree872805a9402f8186584075f1a8cf804b9606efea /sound/Kconfig
parent94f8c66e5e543d79231abf203d6e514ecb668688 (diff)
parent1cc77248106aafc12ba529953f652d6f8db2c84d (diff)
Merge watchdog driver updates
Automated merge from master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog failed due to duplicate different changes to Kconfig file. Manually fixed up. Hopefully.
Diffstat (limited to 'sound/Kconfig')
0 files changed, 0 insertions, 0 deletions