Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 3 Feb 2012 22:12:42 +0000 (23:12 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 3 Feb 2012 22:13:05 +0000 (23:13 +0100)
commit972c5ae961d6e5103e2b33d935cfa4145fd47140
tree350b2a76b979ba8766c09838617df67ff330eca0
parent5196d20305d5e30d871111d3a876cf067dd94255
parent7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f
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)
drivers/media/dvb/frontends/drxk_hard.c
drivers/mfd/ab5500-core.c