]> git.baikalelectronics.ru Git - kernel.git/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)
commit161bc1e928116d781221fdd139dd6ffc9720e443
tree2c07068558092a01d70f737de9b9a34212a44d4b
parentcf239ed08b21f638f1948b7bc5dcc0831c5c2aa0
parent3a3b73d3ce78cc3509f017b080050c84c7b87f16
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