]> err.no Git - linux-2.6/commit
Auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)
commit99ad25a313bda566a346b46a6015afa65bc0a02b
treeb9443fed1ab74f320c4ee0791864ee96d7c069df
parentf62c4a96f74d6c6dd56d1742697e94a5c2085e87
parent9a556e89081b0c1c2f83cee915363b15a68a6f2d
Auto merge with /home/aegl/GIT/linus
arch/ia64/Kconfig
arch/ia64/kernel/setup.c
include/asm-ia64/pci.h