diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 13:20:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 13:20:46 -0800 |
| commit | 432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2 (patch) | |
| tree | 03632e1083e70f0b06211dae5695fb04fa3fd018 /fs/hostfs | |
| parent | f78bb8ad482267b92c122f0e37a7dce69c880247 (diff) | |
| parent | e1c48554ae295de984eee83a7798e7fb394a1629 (diff) | |
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
Diffstat (limited to 'fs/hostfs')
0 files changed, 0 insertions, 0 deletions