aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/const.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-12 18:56:33 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-12 18:56:33 -0500
commit87aa08b7fee79dac908c80f7593007243448ef89 (patch)
tree0fce69996e4be3cfce35300831584a76a4ff1519 /include/linux/const.h
parent3b1b71950b81c4a20ae63c2322383ab4932cdabd (diff)
parent618efba999d0e7f4bcde93231dcb9a748223c6e3 (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] Pika Warp appliance watchdog timer [WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610 [WATCHDOG] Basic support for GE Fanuc's FPGA based watchdog timer [WATCHDOG] wm8350: Fix section annotations
Diffstat (limited to 'include/linux/const.h')
0 files changed, 0 insertions, 0 deletions