]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85be974 78188a6)
Merge branch 'stable/for-linus-3.13' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 31 Dec 2013 14:54:05 +0000 (09:54 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 31 Dec 2013 14:54:05 +0000 (09:54 -0500)
* stable/for-linus-3.13:
  xen/pvhvm: If xen_platform_pci=0 is set don't blow up (v4).

1  2 
drivers/char/tpm/xen-tpmfront.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/tpm/xen-tpmfront.c
Simple merge
Linux kernel for KaRo TX COM modules