diff options
author | Len Brown <len.brown@intel.com> | 2012-01-18 01:15:54 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-01-18 01:15:54 -0500 |
commit | 79ba0db69c5887f1ad4ed51d58894e7e889084b0 (patch) | |
tree | 72948278c60e0997ad2e7cc0181d469c61b62fa8 /drivers/acpi/apei | |
parent | cb7971756b901abd61d47f6eb1011066abfb348d (diff) | |
parent | c130bd6f82e5dda28b1a19741c4c2fe269713199 (diff) | |
parent | 5c2a9f06a9cd7194f884cdc88144866235dec07d (diff) | |
parent | 65b7f839ceecc0a36c7969c0c9151d5748cd4242 (diff) | |
parent | 9f10f6a520deb3639fac78d81151a3ade88b4e7f (diff) | |
parent | 553575f1ae048aa44682b46b3c51929a0b3ad337 (diff) | |
download | linux-79ba0db69c5887f1ad4ed51d58894e7e889084b0.tar.gz linux-79ba0db69c5887f1ad4ed51d58894e7e889084b0.tar.bz2 linux-79ba0db69c5887f1ad4ed51d58894e7e889084b0.zip |
Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into release