From: Maxim Uvarov Date: Mon, 9 Jul 2012 10:11:39 +0000 (-0700) Subject: Merge branch 'uek-2.6.39-200' of git://ca-git.us.oracle.com/linux-uek-2.6.39 into... X-Git-Tag: v2.6.39-400.9.0~499 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2febd39263f5bc108a77a59c69f108949568ef92;p=users%2Fjedix%2Flinux-maple.git Merge branch 'uek-2.6.39-200' of git://ca-git.us.oracle.com/linux-uek-2.6.39 into master_stableup Conflicts: kernel/time/timekeeping.c uek-rpm/ol5/kernel-uek.spec uek-rpm/ol6/kernel-uek.spec Signed-off-by: Maxim Uvarov --- 2febd39263f5bc108a77a59c69f108949568ef92