Greg Kroah-Hartman 407f3fd8fa Merge 3.2-rc5 into staging-next ... This resolves the conflict in the drivers/staging/iio/industrialio-core.c file due to two different changes made to resolve the same problem. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-12-09 19:01:27 -08:00
..
displays	Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next	2011-10-15 00:19:52 +00:00
dss	OMAPDSS: DISPC: skip scaling calculations when not scaling	2011-11-18 10:09:17 +02:00
omapfb	staging: add omapdrm DRM/KMS driver for TI OMAP platforms	2011-11-26 17:43:30 -08:00
Kconfig	OMAP: DSS2: Add generic and Sharp panel drivers	2009-12-09 18:19:42 +02:00
Makefile	OMAP2: avoid descending into disabled framebuffer dirs	2011-05-11 14:20:53 +03:00
vram.c	OMAP: DSS: VRAM: Align start & size of vram to 2M	2010-12-15 11:16:08 +02:00
vrfb.c	…