]> 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>
Mon, 20 Aug 2012 11:01:39 +0000 (04:01 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 20 Aug 2012 11:01:39 +0000 (04:01 -0700)
Conflicts:
arch/x86/xen/enlighten.c

1  2 
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c

Simple merge
Simple merge