]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/pvh.v7' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 6 Feb 2013 16:41:57 +0000 (11:41 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 6 Feb 2013 16:41:57 +0000 (11:41 -0500)
commit3f49cb37512dcbbf5286afd46de2c0de3e3e7801
tree7e31f9bb1d165c9b3c6ab97df22d6f9e54512eb4
parent1c1c40177735d1e2b1ce5c63af88b03cbf4f2477
parent40f633eb0deffa3069bee0c971319118790765b3
Merge branch 'stable/pvh.v7' into linux-next

Conflicts:
drivers/xen/grant-table.c
arch/x86/xen/mmu.c
drivers/xen/grant-table.c