Merge remote-tracking branch 'aufs/aufs3.x-rcN'
RTL8168e's rtl8168e-2.fw
v4l-cx23885-avcore-01.fw
drm/i915: add energy counter support for IVB

On SNB and IVB, there's an MSR (also exposed through MCHBAR) we can use
to read out the amount of energy used over time.  Expose this in debugfs
to make it easy to do power comparisons with different configurations.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Revert "PCI: move mutex locking out of pci_dev_reset function"

It has issues with xen.

This reverts commit 977f857ca566a1e68045fcbb7cfc9c4acb077cf0.
x86/acpi/sleep: Provide registration for acpi_suspend_lowlevel.

Which by default will be x86_acpi_suspend_lowlevel.
This registration allows us to register another callback
if there is a need to use another platform specific callback.

CC: Thomas Gleixner <tglx@linutronix.de>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: x86@kernel.org
CC: Len Brown <len.brown@intel.com>
CC: Joseph Cihula <joseph.cihula@intel.com>
CC: Shane Wang <shane.wang@intel.com>
CC: linux-pm@lists.linux-foundation.org
CC: linux-acpi@vger.kernel.org
CC: Len Brown <len.brown@intel.com>
Signed-off-by: Liang Tang <liang.tang@oracle.com>
[v1: Fix when CONFIG_ACPI_SLEEP is not set]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
xen/acpi/sleep: Register to the acpi_suspend_lowlevel a callback.

We piggyback on "x86/acpi: Provide registration for acpi_suspend_lowlevel."
to register a Xen version of the callback. The callback does not
do anything special - except it omits the x86_acpi_suspend_lowlevel.
It does that b/c during suspend it tries to save cr8 values (which
the hypervisor does not support), and then on resume path the
cr3, cr8, idt, and gdt are all resumed which clashes with what
the hypervisor has set up for the guest.

Signed-off-by: Liang Tang <liang.tang@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
vmalloc_sg: make sure all pages in vmalloc area are really DMA-ready

Under Xen, vmalloc_32() isn't guaranteed to return pages which are really
under 4G in machine physical addresses (only in virtual pseudo-physical
addresses).  To work around this, implement a vmalloc variant which
allocates each page with dma_alloc_coherent() to guarantee that each
page is suitable for the device in question.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Force PCIe ASPM
Prioritize DVB-T over DVB_C on drxk frontends
Get rid of the '+' added when only the short LOCALVERSION is requested
drivers: clocksource: dbx500-prcmu: Add boottime support

Change-Id: I9b5e3d050131c08c08786ae84cb76619c0525049
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32055
Make kvm allow_unsafe_assigned_interrupts the default
Disable ACPI's default strict enforcing of resources
Change RC's repeat and delay defaults
Add rc-rc6-mce.o to CONFIG_IR_NUVOTON's objects
fbcondecor-0.9.6.patch
Intel-IOMMU: disable GFX device mapping as default
ath_regd_optional.patch
zd1211rw-2.6.28.patch