]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 1755801 29903df)
Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 16:38:51 +0000 (12:38 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 16:38:51 +0000 (12:38 -0400)
commit55e5bebf1646beb288767cc57219fa9919ad58e4
tree9ac9ed4a8146a796e7110faacf7ca0a8ba839f93tree
parent175580198d2dd5932c30146d0fa07b18c91ce45dcommit | diff
parent29903df42769a9a8b59a91daedea949737ff13b5commit | diff
Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge

* stable/for-linus-3.4.rebased:
  xen/pci: don't use PCI BIOS service for configuration space accesses
  xen/pte: Fix crashes when trying to see non-existent PGD/PMD/PUD/PTEs
  xen/apic: Return the APIC ID (and version) for CPU 0.
  drivers/video/xen-fbfront.c: add missing cleanup code
  xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'

Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/enlighten.c diff1 | diff2 | blob | history
arch/x86/xen/mmu.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.