]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote branch 'xentip/stable/for-linus-3.12' into linux-next
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Mon, 9 Sep 2013 11:39:36 +0000 (11:39 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Mon, 9 Sep 2013 11:39:36 +0000 (11:39 +0000)
1  2 
arch/arm/xen/enlighten.c

Simple merge