diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 11:06:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 11:06:35 -0700 |
| commit | 4a553e1450827acb1b4bcaa5a0ae079209d16038 (patch) | |
| tree | 2d6f86c633a071253f2087fb32499c1a18d16ac8 /arch/x86/include/asm/dma-contiguous.h | |
| parent | 08815bc267291ea0a4f7f348290efc555444d7a8 (diff) | |
| parent | dec08a837fda146fee498ffc5ecd0d2eeeacd025 (diff) | |
| parent | 05194cfc547528a01d655262c49da3b1311c4b11 (diff) | |
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