Merge branch 'master' into pathbased
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 12 May 2010 21:57:39 +0000 (14:57 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 12 May 2010 21:57:39 +0000 (14:57 -0700)
1  2 
com32/modules/cpuid.c

Simple merge