]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0c3911 d91bb17)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2012 21:46:40 +0000 (13:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2012 21:46:40 +0000 (13:46 -0800)
commit79e979eae0df58831e85281e3285f63663f3cf76
tree03263ca6cd0709763be0461202a46dd7f73fa3c4tree
parentf0c391131a6483004791458f181d2a6f6ffb1c11commit | diff
parentd91bb17c2a874493603c4d99db305d8caf2d180ccommit | diff
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull power tools fixes from Len Brown:
 "A pair of power tools patches -- a 3.7 regression fix plus a bug fix."

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: graceful fail on garbage input
  tools/power turbostat: Repair Segmentation fault when using -i option
Ubuntu Disco kernel mirror for Proxmox VE and PMG