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]: Update defconfig. [SPARC]: Add missing of_node_put [SPARC64]: check for possible NULL pointer dereference [SPARC]: Add missing "space" [SPARC64]: Add missing "space" [SPARC64]: Add missing pci_dev_put [SYSCTL_CHECK]: Fix typo in KERN_SPARC_SCONS_PWROFF entry string. [SPARC64]: Missing mdesc_release() in ldc_init().
This commit is contained in:
@ -96,7 +96,7 @@ static struct trans_ctl_table trans_kern_table[] = {
|
||||
|
||||
{ KERN_PTY, "pty", trans_pty_table },
|
||||
{ KERN_NGROUPS_MAX, "ngroups_max" },
|
||||
{ KERN_SPARC_SCONS_PWROFF, "scons_poweroff" },
|
||||
{ KERN_SPARC_SCONS_PWROFF, "scons-poweroff" },
|
||||
{ KERN_HZ_TIMER, "hz_timer" },
|
||||
{ KERN_UNKNOWN_NMI_PANIC, "unknown_nmi_panic" },
|
||||
{ KERN_BOOTLOADER_TYPE, "bootloader_type" },
|
||||
|
Reference in New Issue
Block a user