diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-08 16:12:41 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-08 16:12:41 (GMT) |
| commit | cfae7e3eb1334ff8035bb66f307f3d4010e65646 (patch) | |
| tree | f02e6d4503387d9becb523740398553e6aa06743 /drivers/watchdog/cpwd.c | |
| parent | 267ba96492c897970471cbe64f748e3f46ae71cf (diff) | |
| parent | 6f2d9d99213514360034c6d52d2c3919290b3504 (diff) | |
| download | linux-cfae7e3eb1334ff8035bb66f307f3d4010e65646.tar.xz | |
Merge tag 'for-linus-4.7b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel:
- Fix two bugs in the handling of xenbus transactions.
- Make the xen acpi driver compatible with Xen 4.7.
* tag 'for-linus-4.7b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/acpi: allow xen-acpi-processor driver to load on Xen 4.7
xenbus: simplify xenbus_dev_request_and_reply()
xenbus: don't bail early from xenbus_dev_request_and_reply()
xenbus: don't BUG() on user mode induced condition
Diffstat (limited to 'drivers/watchdog/cpwd.c')
0 files changed, 0 insertions, 0 deletions