Pull for-2.6.31 into release

diff --cc arch/ia64/hp/common/sba_iommu.c
Simple merge

diff --cc arch/ia64/kernel/mca.c
Simple merge

diff --cc arch/ia64/kernel/perfmon.c
Simple merge

diff --cc arch/ia64/kernel/uncached.c
Simple merge