From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2011 16:08:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
X-Git-Tag: v3.0-rc1~346
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f;p=thirdparty%2Fkernel%2Flinux.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:
  apm-emulation: apm_mutex breaks ACK; remove it
  APM: take over maintainership
---

e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f