]> 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)
commit72e645b88b2774312be0e4c570d989969b9738b9
treef0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7
parent86716396423654a74bbaa859abcb1bd1e56006ab
parent12596f2f820c87c9ccb8c17d856ac24c0c13a254
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