summaryrefslogtreecommitdiff
path: root/arch/x86/configs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-19 13:06:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-19 13:06:51 -0800
commit16ec54ad1502a095a35b4ae3bf6ec129111a44c5 (patch)
treeb722c1eaa255bd854fcbe1a2ac313a282a120767 /arch/x86/configs
parent7d0d46da750a252371cb747b48ddda27d1047881 (diff)
parentbee09ed91cacdbffdbcd3b05de8409c77ec9fcd6 (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: - an s2ram related fix on AMD systems - a perf fault handling bug that is relatively old but which has become much easier to trigger in v3.13 after commit e00b12e64be9 ("perf/x86: Further optimize copy_from_user_nmi()") * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/amd/ibs: Fix waking up from S3 for AMD family 10h x86, mm, perf: Allow recursive faults from interrupts
Diffstat (limited to 'arch/x86/configs')
0 files changed, 0 insertions, 0 deletions