diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 22:20:46 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 22:20:46 +0100 |
commit | 432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2 (patch) | |
tree | 03632e1083e70f0b06211dae5695fb04fa3fd018 /fs | |
parent | slab: fix calculate_slab_order() for SLAB_RECLAIM_ACCOUNT (diff) | |
parent | [IA64] mca recovery return value when no bus check (diff) | |
download | linux-432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2.tar.xz linux-432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2.zip |
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')
0 files changed, 0 insertions, 0 deletions