]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: eb1a68c bea3738)
Merge tag 'v3.0.31' into uek2-2.6.39-300#14252075
authorGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 21:17:54 +0000 (14:17 -0700)
committerGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 21:17:54 +0000 (14:17 -0700)
commit0e0928841d9cceedd6d632646299080f138512a2
tree0af2df841c00903e4badbb08fd66509294dccdcatree
parenteb1a68cb528ea02ffc3beb16e12fd3ec276a486ccommit | diff
parentbea37381fd9a34c6660e5195d31beea86aa3dda3commit | diff
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>
Makefile diff1 | diff2 | blob | history
drivers/hwmon/fam15h_power.c diff1 | diff2 | blob | history
fs/nfs/nfs4proc.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.