]> git.proxmox.com Git - mirror_ubuntu-disco-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>
Mon, 23 May 2011 16:08:19 +0000 (09:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 16:08:19 +0000 (09:08 -0700)
commite0c6b8a17fb3d4a740386b380ea72aa8388fbf2f
tree45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec
parent710421cc7d295cc59eb2676fe2ba3bc3252c124e
parentfda5fe19725edd6805f2fd742235d1a0d0ba93f5
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
MAINTAINERS