]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'uek-2.6.39-200' of git://ca-git.us.oracle.com/linux-uek-2.6.39 into...
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 9 Jul 2012 10:11:39 +0000 (03:11 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 9 Jul 2012 10:11:39 +0000 (03:11 -0700)
Conflicts:
kernel/time/timekeeping.c
uek-rpm/ol5/kernel-uek.spec
uek-rpm/ol6/kernel-uek.spec

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
1  2 
kernel/time/timekeeping.c
uek-rpm/ol5/kernel-uek.spec
uek-rpm/ol6/kernel-uek.spec

Simple merge
Simple merge
Simple merge