Pull miscellaneous into release branch
authorTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:14:51 +0000 (10:14 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:14:51 +0000 (10:14 -0700)
Conflicts:

arch/ia64/kernel/mca.c


Trivial merge