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 <guangyu.sun@oracle.com>

diff --cc Makefile
Simple merge

diff --cc drivers/hwmon/fam15h_power.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge