]> 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>
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)
commitc80c5151053ab2e9a4641de2439d7713154a1c0a
tree45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec
parent97544f20106d85ea8e8109e7c4e07b736a994702
parentad3ece1bcd67fd60e0cc893a210ad92b12612396
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