]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbcc4ca 1fd1443)
Merge branch 'stable/for-linus-3.4' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 16:29:26 +0000 (12:29 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 16:29:26 +0000 (12:29 -0400)
commit2f5d45bb6edf541ae96555d03432d3bc13ba5658
treec987228cee239d546e2db6332bfbd8ecac02265ftree | snapshot
parentcbcc4ca92cce2c89fe4c03ec25f8ca0883204a5acommit | diff
parent1fd14432294a86d46db55d8e96f5a26e97592c95commit | diff
Merge branch 'stable/for-linus-3.4' into linux-next

* stable/for-linus-3.4:
  xen/Kconfig: fix Kconfig layout
  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

Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/enlighten.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules