tree 350b2a76b979ba8766c09838617df67ff330eca0
parent 5196d20305d5e30d871111d3a876cf067dd94255
parent 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f
author Jiri Kosina <jkosina@suse.cz> 1328307162 +0100
committer Jiri Kosina <jkosina@suse.cz> 1328307185 +0100

Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)