summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-20 03:04:34 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-20 03:04:34 -0700
commit4896f66ee760fd0c3362b03dadb78dfdfecf44b7 (patch)
treecf9baee3d79625939d194d9eb21f8f22f1c12092 /include/linux
parent178f53128d0286ab532701268e6bf72631f6cb61 (diff)
parentae6d965239be925622f9fa9af7e29d7b44c1b08e (diff)
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions