]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 21 Sep 2012 12:07:22 +0000 (05:07 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 21 Sep 2012 12:07:22 +0000 (05:07 -0700)
1  2 
arch/x86/xen/enlighten.c

Simple merge