Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] mca recovery return value when no bus check [IA64] SGI SN drivers: don't report !sn2 hardware as an error [IA64] don't report !sn2 or !summit hardware as an error [IA64] gensparse_defconfig: turn on PNPACPI [IA64] Increase severity of MCA recovery messages
No related branches found
No related tags found
Showing
- arch/ia64/configs/gensparse_defconfig 10 additions, 2 deletionsarch/ia64/configs/gensparse_defconfig
- arch/ia64/kernel/cyclone.c 1 addition, 1 deletionarch/ia64/kernel/cyclone.c
- arch/ia64/kernel/mca_drv.c 11 additions, 5 deletionsarch/ia64/kernel/mca_drv.c
- arch/ia64/sn/kernel/sn2/sn2_smp.c 1 addition, 1 deletionarch/ia64/sn/kernel/sn2/sn2_smp.c
- arch/ia64/sn/kernel/tiocx.c 1 addition, 1 deletionarch/ia64/sn/kernel/tiocx.c
- drivers/char/mmtimer.c 1 addition, 1 deletiondrivers/char/mmtimer.c
- drivers/serial/sn_console.c 1 addition, 1 deletiondrivers/serial/sn_console.c
Loading
Please register or sign in to comment