]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcdd3a9 1b66776)
Pull rationalise-regions into release branch
authorTony Luck <tony.luck@intel.com>
Mon, 29 Aug 2005 22:50:32 +0000 (15:50 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 29 Aug 2005 22:50:32 +0000 (15:50 -0700)
1  2 
include/asm-ia64/io.h patch | diff1 | diff2 | blob | history
include/asm-ia64/mmu_context.h patch | diff1 | diff2 | blob | history
include/asm-ia64/sn/addrs.h patch | diff1 | diff2 | blob | history

diff --cc include/asm-ia64/io.h
Simple merge
diff --cc include/asm-ia64/mmu_context.h
Simple merge
diff --cc include/asm-ia64/sn/addrs.h
Simple merge
Linux 2.6 source tree