summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-30 16:44:19 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-30 16:44:19 +0200
commit9db8ee3d96e98705ba4e9260815ca326b0d07741 (patch)
treecc51209ce3065a10850481cdc18c6376130146aa /drivers/watchdog
parentacpi: fix sparse const errors (diff)
parent[S390] Update default configuration. (diff)
downloadlinux-9db8ee3d96e98705ba4e9260815ca326b0d07741.tar.xz
linux-9db8ee3d96e98705ba4e9260815ca326b0d07741.zip
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] Update default configuration. [S390] disassembler: fix idte instruction format. [S390] tape: fix race with stack local wait_queue_head_t. [S390] 3270: fix race with stack local wait_queue_head_t. [S390] dasd: use a generic wait_queue for sleep_on [S390] sclp_vt220: fix scheduling while atomic bug. [S390] showmem: Only walk spanned pages. [S390] appldata: prevent cpu hotplug when walking cpu_online_map. [S390] Fix section mismatch warnings. [S390] s390 types: make dma_addr_t 64 bit capable [S390] tape: Fix race condition in tape block device driver [S390] fix sparsemem related compile error with allnoconfig on s390
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions