]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:49:06 +0000 (13:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:49:06 +0000 (13:49 -0700)
commitd07fb459f219992f79784ea30a713c76969123dc
tree2467a3fcf23e54ca68545427feb4e2d19f083b75
parent3b5099fc3070e30cc518e537e94239da751ed669
parent6eb382f58e651879516d875265843905d305328e
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.