diff options
| author |   Len Brown <len.brown@intel.com> | 2013-02-18 00:25:53 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-02-18 00:25:53 -0500 |
| commit | ca62cf59ceef10ff2ebca0e7f764507186870270 (patch) | |
| tree | 480ebfd5551db27052f501917a7e0314043c6778 /drivers/acpi/pci_bind.c | |
| parent | Merge branches 'idle-remove-statedata', 'pm_idle' and 'idle-hsw-turbostat' into release (diff) | |
| parent | x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag (diff) | |
| download | linux-dev-ca62cf59ceef10ff2ebca0e7f764507186870270.tar.xz linux-dev-ca62cf59ceef10ff2ebca0e7f764507186870270.zip | |
Merge branch 'misc' into release
Conflicts:
arch/x86/kernel/process.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/pci_bind.c')
0 files changed, 0 insertions, 0 deletions