diff options
| author | Linus Torvalds <[email protected]> | 2012-10-01 18:06:35 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-10-01 18:06:35 +0000 |
| commit | 4a553e1450827acb1b4bcaa5a0ae079209d16038 (patch) | |
| tree | 2d6f86c633a071253f2087fb32499c1a18d16ac8 /fs/proc/array.c | |
| parent | Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x86: Remove the useless branch in c_start() (diff) | |
| parent | x86, cpufeature: Add feature bit for SMAP (diff) | |
| download | kernel-4a553e1450827acb1b4bcaa5a0ae079209d16038.tar.gz kernel-4a553e1450827acb1b4bcaa5a0ae079209d16038.zip | |
Merge branches 'x86-cpu-for-linus' and 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/cpu and x86/cpufeature from Ingo Molnar:
"One tiny cleanup, and prepare for SMAP (Supervisor Mode Access
Prevention) support on x86"
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Remove the useless branch in c_start()
* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpufeature: Add feature bit for SMAP