Merge branch 'linus' into x86/cpu
authorIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 14:16:15 +0000 (16:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 14:16:15 +0000 (16:16 +0200)
commit1a10390708d675ebf1a2f5e169a5165626afbd88
treed9ee7d10abd65e580fb74152a501089f51174225
parent239bd83104ec6bcba90221d8b0973d2565142ef8
parentb635acec48bcaa9183fcbf4e3955616b0d4119b5
Merge branch 'linus' into x86/cpu
arch/x86/kernel/cpu/intel_cacheinfo.c