Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into release
authorLen Brown <len.brown@intel.com>
Wed, 18 Jan 2012 06:15:54 +0000 (01:15 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 18 Jan 2012 06:15:54 +0000 (01:15 -0500)
commit79ba0db69c5887f1ad4ed51d58894e7e889084b0
tree72948278c60e0997ad2e7cc0181d469c61b62fa8
parentcb7971756b901abd61d47f6eb1011066abfb348d
parentc130bd6f82e5dda28b1a19741c4c2fe269713199
parent5c2a9f06a9cd7194f884cdc88144866235dec07d
parent65b7f839ceecc0a36c7969c0c9151d5748cd4242
parent9f10f6a520deb3639fac78d81151a3ade88b4e7f
parent553575f1ae048aa44682b46b3c51929a0b3ad337
Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into release
drivers/acpi/apei/einj.c
drivers/idle/intel_idle.c
tools/power/x86/turbostat/turbostat.c