summaryrefslogtreecommitdiffstats
path: root/kernel/events/ring_buffer.c
diff options
context:
space:
mode:
authorLinus Torvalds2012-01-08 22:15:27 +0100
committerLinus Torvalds2012-01-08 22:15:27 +0100
commitb4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (patch)
treef0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7 /kernel/events/ring_buffer.c
parentMerge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentx86: Kconfig: drop unknown symbol 'APM_MODULE' (diff)
downloadkernel-qcow2-linux-b4a133da2eaccb844a7beaef16ffd9c76a0d21d3.tar.gz
kernel-qcow2-linux-b4a133da2eaccb844a7beaef16ffd9c76a0d21d3.tar.xz
kernel-qcow2-linux-b4a133da2eaccb844a7beaef16ffd9c76a0d21d3.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: x86: Kconfig: drop unknown symbol 'APM_MODULE'
Diffstat (limited to 'kernel/events/ring_buffer.c')
0 files changed, 0 insertions, 0 deletions