summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 19:48:52 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 19:48:52 (GMT)
commitefcbae253f97bf82e7befd372da3ad5995a53f1a (patch)
treefbbba7dc1af78b341fbaab0bf329d343accff4ea /arch
parent54a772b8aace3df8ad6af0bd0748f57d27f72b1d (diff)
parentf71d26bb6503e9b11b91444819b2f96872baaab8 (diff)
downloadlinux-fsl-qoriq-efcbae253f97bf82e7befd372da3ad5995a53f1a.tar.xz
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 'arch')
0 files changed, 0 insertions, 0 deletions