]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
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)
1  2 
arch/ia64/Kconfig
arch/ia64/kernel/setup.c
include/asm-ia64/pci.h

Simple merge
Simple merge
Simple merge