]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
commitc20bcf0d90e1ab26337356957e4087708ab7e45c
tree3e51386cdfeae71bce418a7d20be23dad0940396
parentc3c04a135bd4391a40157f7f8113db1e3fa2997f
parentcf7cd75cf164e4258ced64ab49a409380116822b
Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public

Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c