]> err.no Git - linux-2.6/commit
Pull sn2-mmio-writes into release branch
authorTony Luck <tony.luck@intel.com>
Tue, 21 Mar 2006 16:21:26 +0000 (08:21 -0800)
committerTony Luck <tony.luck@intel.com>
Tue, 21 Mar 2006 16:21:26 +0000 (08:21 -0800)
commit409761bb6a06bd61e2d8e27a1af534371d9537ed
tree2c07068558092a01d70f737de9b9a34212a44d4b
parenta4e817ba24d2a52f0332c2ddcdbf77ddd6a92bbe
parente08e6c521355cd33e647b2f739885bc3050eead6
Pull sn2-mmio-writes into release branch

Hand-fixed conflicts:
include/asm-ia64/machvec_sn2.h

Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/sn/kernel/setup.c
arch/ia64/sn/kernel/sn2/sn2_smp.c
include/asm-ia64/machvec_sn2.h
include/asm-ia64/processor.h
include/asm-ia64/system.h
include/asm-ia64/thread_info.h