From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jan 2012 21:15:27 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
X-Git-Tag: v3.3-rc1~166
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b4a133da2eaccb844a7beaef16ffd9c76a0d21d3;p=users%2Fjedix%2Flinux-maple.git

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'
---

b4a133da2eaccb844a7beaef16ffd9c76a0d21d3