aboutsummaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 12:48:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 12:48:52 -0700
commitefcbae253f97bf82e7befd372da3ad5995a53f1a (patch)
treefbbba7dc1af78b341fbaab0bf329d343accff4ea /firmware
parentMerge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (diff)
parentwatchdog: hpwdt depends on PCI (diff)
downloadlinux-dev-efcbae253f97bf82e7befd372da3ad5995a53f1a.tar.xz
linux-dev-efcbae253f97bf82e7befd372da3ad5995a53f1a.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: hpwdt depends on PCI watchdog: fix hpwdt Kconfig regression in 3.0-rc
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions