]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c10bd5e e9daff2)
Merge branch 'stable/for-linus-3.8' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 15 Feb 2013 02:31:52 +0000 (21:31 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 15 Feb 2013 02:31:52 +0000 (21:31 -0500)
commit77f259be86fe465d9f5ac3d30502fc7c2872dd28
tree103cb224ac01609445d964d358c2c3e037116cfetree | snapshot
parentc10bd5efedb27a0c3d320c53c41d7fea05c0bcd5commit | diff
parente9daff24a266307943457086533041bd971d0ef9commit | diff
Merge branch 'stable/for-linus-3.8' into linux-next

* stable/for-linus-3.8:
  Revert "xen PVonHVM: use E820_Reserved area for shared_info"
  Revert "xen/PVonHVM: fix compile warning in init_hvm_pv_info"

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