Ingo Molnar daab7fc734 Merge commit 'v2.6.36-rc3' into x86/memblock ... Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c Merge reason: Resolve the conflicts, update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-31 09:45:46 +02:00
..
displays	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-08-08 10:02:59 -07:00
dss	OMAP: DSS2: Replace strncmp() with sysfs_streq() in overlay_manager_store()	2010-08-05 16:52:18 +03:00
omapfb	OMAP: DSS2: OMAPFB: add support for FBIO_WAITFORVSYNC	2010-08-05 16:52:19 +03:00
Kconfig	OMAP: DSS2: Add generic and Sharp panel drivers	2009-12-09 18:19:42 +02:00
Makefile	OMAP: DSS2: Add generic and Sharp panel drivers	2009-12-09 18:19:42 +02:00
vram.c	memblock/arm: Use memblock_region_is_memory() for omap fb	2010-08-04 14:38:56 +10:00
vrfb.c