]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1989dee48ccf16ba2ce2deb2a870a8f4eab4f92a
treef0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7
parent88f8bf18e14c4e2eb98e3cc15f45a3f356227a42
parent5ac2c28d85272b87acfdc240ff78bf7d567147ce
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'
arch/x86/Kconfig