summaryrefslogtreecommitdiff
path: root/drivers/scsi/mesh.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-06 00:49:06 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-06 00:49:06 +0400
commitd3acd16cda3a1cbaff7c579c0e054f0ece613d14 (patch)
tree2467a3fcf23e54ca68545427feb4e2d19f083b75 /drivers/scsi/mesh.c
parent93697a3cabd3605c434a9b915c0272ad800b3f97 (diff)
parentbd4352cadfacb9084c97c853b025fac010266c26 (diff)
downloadlinux-d3acd16cda3a1cbaff7c579c0e054f0ece613d14.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix bootup with mcount in some configs. sparc64: Kill spurious NMI watchdog triggers by increasing limit to 30 seconds.
Diffstat (limited to 'drivers/scsi/mesh.c')
0 files changed, 0 insertions, 0 deletions