diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:06:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:06:28 -0700 |
| commit | f7ddc2b6cd880a259db338925d03bdc01f1d26c1 (patch) | |
| tree | fdc28aeb2219d683f88df96e55297ac84aa8c129 /kernel/workqueue.c | |
| parent | Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | x86, mrst: make mrst_timer_options an enum (diff) | |
| download | linux-rng-f7ddc2b6cd880a259db338925d03bdc01f1d26c1.tar.xz linux-rng-f7ddc2b6cd880a259db338925d03bdc01f1d26c1.zip | |
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
Diffstat (limited to 'kernel/workqueue.c')
0 files changed, 0 insertions, 0 deletions