From: Tony Luck <tony.luck@intel.com>
Date: Thu, 17 Apr 2008 17:14:51 +0000 (-0700)
Subject: Pull miscellaneous into release branch
X-Git-Tag: v2.6.26-rc1~1146^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b264f85ff50c14fe945ffff06ae0d5e9a9124e;p=pandora-kernel.git

Pull miscellaneous into release branch

Conflicts:

	arch/ia64/kernel/mca.c
---

71b264f85ff50c14fe945ffff06ae0d5e9a9124e
Reading git-diff-tree failed