diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 11:25:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 11:25:34 -0400 |
commit | 49899007b9401486421c99bb269db89b88136e47 (patch) | |
tree | ce73158ca09d04749dc2685eacf86b45554bd666 /include/scsi/libfc.h | |
parent | 6fedb0ff32e6bfcc408a8d52c68b8bfe4e3d945b (diff) | |
parent | e7c95ff32d0075736cbdd8d38d954fb4ed6ced9b (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull idle update from Len Brown:
"Two Intel-platform-specific updates to intel_idle, and a cosmetic
tweak to the turbostat utility"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: tweak whitespace in output format
intel_idle: Broadwell support
intel_idle: Disable Baytrail Core and Module C6 auto-demotion
Diffstat (limited to 'include/scsi/libfc.h')
0 files changed, 0 insertions, 0 deletions