Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 04:09:26 +0000 (21:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 04:09:26 +0000 (21:09 -0700)
commit8a212ab6b8a4ccc6f3c3d1beba5f92655c576404
tree525271129ff9c692defdd20566f1f7203b18ff24
parent1f419cadff55f548e7356ffebdb9e1b5a8c22275
parent0e1f60609258e18ec0a0477c646101212822d387
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6
arch/ia64/hp/common/hwsw_iommu.c
arch/ia64/hp/common/sba_iommu.c
arch/ia64/lib/swiotlb.c
arch/ia64/sn/kernel/xpc.h
arch/ia64/sn/pci/pci_dma.c
drivers/char/snsc.c
include/asm-ia64/machvec.h