summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-23 09:08:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-23 09:08:19 -0700
commite0c6b8a17fb3d4a740386b380ea72aa8388fbf2f (patch)
tree45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec /tools
parent710421cc7d295cc59eb2676fe2ba3bc3252c124e (diff)
parentfda5fe19725edd6805f2fd742235d1a0d0ba93f5 (diff)
downloadlinux-3.10-e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f.tar.gz
linux-3.10-e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f.tar.bz2
linux-3.10-e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f.zip
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
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions