aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-06 19:11:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-06 19:11:22 -0400
commitc28cf0fdcd38e912fa72258d78cb213b716247d6 (patch)
tree105f87dc9fb41662a723c167b92c04cb4804adea /drivers/media/video
parent64ba4f230d30b089bc89db2e59d02c1efa5ac769 (diff)
parentcc1020f15ad0f843c0111bf4b77bdfaabca79571 (diff)
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] it8712f_wdt Zero MSB timeout byte when disabling watchdog
Diffstat (limited to 'drivers/media/video')
0 files changed, 0 insertions, 0 deletions