diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-24 14:29:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-24 14:29:23 -0700 |
| commit | 42ea16f815e7adb155557eb3017510e635edbcfe (patch) | |
| tree | 63b2c875425f2ac7f75f20d74739a24ca7660c8d /drivers/watchdog/pnx833x_wdt.c | |
| parent | 69917da73a4fa03b2c13fde976ba1aad950d9181 (diff) | |
| parent | 1914f0cd203c941bba72f9452c8290324f1ef3dc (diff) | |
Merge tag 'for-linus-4.11b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Fixes for PM under Xen"
* tag 'for-linus-4.11b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/acpi: upload PM state from init-domain to Xen
xen/acpi: Replace hard coded "ACPI0007"
Diffstat (limited to 'drivers/watchdog/pnx833x_wdt.c')
0 files changed, 0 insertions, 0 deletions