Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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

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

diff --cc arch/ia64/lib/swiotlb.c
Simple merge

diff --cc arch/ia64/sn/kernel/xpc.h
Simple merge

diff --cc arch/ia64/sn/pci/pci_dma.c
Simple merge

diff --cc drivers/char/snsc.c
Simple merge

diff --cc include/asm-ia64/machvec.h
Simple merge