Tomi Valkeinen dcca5cf07b Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux ...

Conflicts:
	drivers/video/omap2/dss/Kconfig
	drivers/video/omap2/omapfb/omapfb-ioctl.c
	drivers/video/omap2/omapfb/omapfb-main.c

Merge changes to make omapfb use common dma_alloc, and remove omap's
custom vram allocator.

2012-11-16 11:42:46 +02:00

..

include/plat

Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux

2012-11-16 11:42:46 +02:00

clock.c

ARM: OMAP2+: hwmod: get rid of all omap_clk_get_by_name usage

2012-09-22 10:50:01 -06:00

common.c

OMAP: common.c: remove init call to vram

2012-11-13 09:52:36 +02:00

counter_32k.c

ARM: OMAP: counter: add locking to read_persistent_clock

2012-10-08 14:01:12 -07:00

debug-devices.c

ARM: OMAP: resolve sparse warning concerning debug_card_init()

2012-10-16 14:05:50 -07:00

debug-leds.c

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-01 18:46:13 -07:00

dma.c

Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7

2012-09-23 17:15:44 -06:00

dmtimer.c

ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*()

2012-08-13 06:23:16 -07:00

fb.c

Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux

2012-11-16 11:42:46 +02:00

i2c.c

Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

2012-10-11 10:27:51 +09:00

Kconfig

ARM: OMAP2+: Fix location of select PINCTRL

2012-10-22 13:37:34 -07:00

mailbox.c

workqueue: deprecate flush[_delayed]_work_sync()

2012-08-20 14:51:24 -07:00

Makefile

ARM: OMAP1: Make plat/mux.h omap1 only

2012-09-20 14:54:57 -07:00

omap_device.c

Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm

2012-10-08 15:57:41 -07:00

omap-pm-noop.c

arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon

2012-10-08 18:09:30 -07:00

sram.c

Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7

2012-09-23 17:15:44 -06:00

sram.h

OMAP: plat-omap: Fix static function warnings

2010-10-08 10:12:38 -07:00