From: Guangyu Sun Date: Tue, 3 Jul 2012 21:17:54 +0000 (-0700) Subject: Merge tag 'v3.0.31' into uek2-2.6.39-300#14252075 X-Git-Tag: v2.6.39-400.9.0~508 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0e0928841d9cceedd6d632646299080f138512a2;p=users%2Fjedix%2Flinux-maple.git Merge tag 'v3.0.31' into uek2-2.6.39-300#14252075 This is the 3.0.31 stable release Conflicts: drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/hwmon/fam15h_power.c virt/kvm/iommu.c Signed-off-by: Guangyu Sun --- 0e0928841d9cceedd6d632646299080f138512a2