tree 45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec
parent 710421cc7d295cc59eb2676fe2ba3bc3252c124e
parent fda5fe19725edd6805f2fd742235d1a0d0ba93f5
author Linus Torvalds <torvalds@linux-foundation.org> 1306166899 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306166899 -0700

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