]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/for-linus-3.8' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 28 Nov 2012 19:43:13 +0000 (14:43 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 28 Nov 2012 19:43:13 +0000 (14:43 -0500)
commit25cba9a9a48b0c3912461155dae88831471a89dd
treef6245f6af9cf76beb314b3e43f174c8481e8bbbe
parent6844241158dd5bdef5ee20793aefcef6fc2446f2
parent394b40f62d7ae18a1c48c13fc483b8193f8c3a98
Merge branch 'stable/for-linus-3.8' into linux-next

* stable/for-linus-3.8:
  xen/acpi: Move the xen_running_on_version_or_later function.
  xen/xenbus: Remove duplicate inclusion of asm/xen/hypervisor.h
  xen/acpi: Fix compile error by missing decleration for xen_domain.
  xen/acpi: revert pad config check in xen_check_mwait
  xen/acpi: ACPI PAD driver
  xen-pciback: reject out of range inputs
  xen-pciback: simplify and tighten parsing of device IDs
  xen PVonHVM: use E820_Reserved area for shared_info

Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/enlighten.c
drivers/xen/Makefile
include/xen/xen-ops.h