| commit | f7ddc2b6cd880a259db338925d03bdc01f1d26c1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 10:06:28 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 10:06:28 2010 -0700 |
| tree | fdc28aeb2219d683f88df96e55297ac84aa8c129 | |
| parent | a5e11599da95fbe8425db0cfd01a581d7412d0c9 [diff] | |
| parent | 14671386dcbafb3086bbda3cb6f9f27d34c7bf6d [diff] |
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mrst: make mrst_timer_options an enum x86, mrst: make mrst_identify_cpu() an inline returning enum x86, mrst: add more timer config options x86, mrst: add cpu type detection x86: detect scattered cpuid features earlier