From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Mar 2006 21:20:46 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.16-rc6~79
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2;p=linux-2.6

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
---

432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2