summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-20 17:24:46 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-20 17:24:46 (GMT)
commitd006de93531a9876b26919e9d2bbf562654ab736 (patch)
treebc4b965e43ea446543cd2407d7bcec3efa9c09b1 /crypto
parent0ad79ed34c909205184cb85e855cdf3e17a6eac8 (diff)
parent4e8858d5130459c4af80b990c2280115a1d49877 (diff)
downloadlinux-fsl-qoriq-d006de93531a9876b26919e9d2bbf562654ab736.tar.xz
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog: watchdog: Initconst section fixes for watchdog watchdog: lantiq: fix watchdogs timeout handling watchdog: hpwdt: prevent multiple "NMI occurred" messages watchdog: WatchDog Timer Driver Core - use passed watchdog_device
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions