diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-03 17:32:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-03 17:32:55 -0500 |
| commit | 3024e4a99744f5b59704a6570524a312f94f010f (patch) | |
| tree | 52739d6ef2af3afe3dc7b0f7ee942fd43da107c1 /security/smack/smackfs.c | |
| parent | f2a4165526a9746afc4ba5413b1756614a49d450 (diff) | |
| parent | 780eef9492b16a1543a3b2ae9f9526a735fc9856 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: oprofile: don't set counter width from cpuid on Core2
x86: fix init_memory_mapping() to handle small ranges
Diffstat (limited to 'security/smack/smackfs.c')
0 files changed, 0 insertions, 0 deletions