aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds2012-01-08 13:15:27 -0800
committerLinus Torvalds2012-01-08 13:15:27 -0800
commitb4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (patch)
treef0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7 /kernel
parenteb59c505f8a5906ad2e053d14fab50eb8574fd6f (diff)
parent282e5aaba2a0cdfde4d2c2e34bc7438cd6f7a00f (diff)
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')
0 files changed, 0 insertions, 0 deletions