]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitffcb879048d9b47aaf6022416e3a9761a2f1feab
treeed14c4da67c66643726e0121e5599dc930d7a637
parent85be9741104f96bb5b5224319ee00b3a362f6110
parent78188a60c1f932958404fff5cdb4ee23e3fd83e1
Merge branch 'stable/for-linus-3.13' into linux-next

* stable/for-linus-3.13:
  xen/pvhvm: If xen_platform_pci=0 is set don't blow up (v4).
drivers/char/tpm/xen-tpmfront.c