]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb8a55e 58cd908)
Pull context-bitmap into release branch
authorTony Luck <tony.luck@intel.com>
Thu, 10 Nov 2005 18:39:49 +0000 (10:39 -0800)
committerTony Luck <tony.luck@intel.com>
Thu, 10 Nov 2005 18:39:49 +0000 (10:39 -0800)
1  2 
arch/ia64/kernel/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/kernel/setup.c
Simple merge
Linux 2.6 source tree