projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb59c50 282e5aa)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jan 2012 21:15:27 +0000 (13:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jan 2012 21:15:27 +0000 (13:15 -0800)
commitb4a133da2eaccb844a7beaef16ffd9c76a0d21d3
treef0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7tree | snapshot
parenteb59c505f8a5906ad2e053d14fab50eb8574fd6fcommit | diff
parent282e5aaba2a0cdfde4d2c2e34bc7438cd6f7a00fcommit | diff
Merge branch 'for-linus' of git://git./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'
arch/x86/Kconfig diff1 | diff2 | blob | history
Domain: System / Kernel;