]> git.hungrycats.org Git - linux/commitdiff
Merge intel.com:/home/lenb/src/26-stable-dev
authorLen Brown <len.brown@intel.com>
Fri, 8 Oct 2004 13:56:02 +0000 (09:56 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 8 Oct 2004 13:56:02 +0000 (09:56 -0400)
into intel.com:/home/lenb/src/26-latest-dev

1  2 
arch/x86_64/kernel/setup.c

Simple merge