From: Santosh Shilimkar Date: Wed, 26 Aug 2015 19:08:16 +0000 (-0700) Subject: Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com... X-Git-Tag: v4.1.12-92~296 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1571055f27ccad01afeea7e0c54ee791d3fab66e;p=users%2Fjedix%2Flinux-maple.git Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1 * 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek: CVE-2015-666: Revert "sched/x86_64: Don't save flags on context switch" --- 1571055f27ccad01afeea7e0c54ee791d3fab66e