]> 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>
Fri, 20 Jul 2012 15:14:03 +0000 (08:14 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 20 Jul 2012 15:14:03 +0000 (08:14 -0700)
commite54d1bb67c18376c7c4624db20c74a196ec4afe6
treef8a01dd29fce71b14c10a97639d73ed2951846c4
parent15101fc1de24a8a9648536f924454a0056b17dd3
parent984cf77b3306d3a3106b18283644ea481e88007d
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