| commit | d3acd16cda3a1cbaff7c579c0e054f0ece613d14 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 05 13:49:06 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 05 13:49:06 2009 -0700 |
| tree | 2467a3fcf23e54ca68545427feb4e2d19f083b75 | |
| parent | 93697a3cabd3605c434a9b915c0272ad800b3f97 [diff] | |
| parent | bd4352cadfacb9084c97c853b025fac010266c26 [diff] |
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.