summaryrefslogtreecommitdiffstats
path: root/arch/avr32/lib/Makefile
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-16 11:42:46 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-16 11:42:46 +0200
commitdcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 (patch)
treefb198f6a52f4790ea2468a421fc8c91a3b3648c8 /arch/avr32/lib/Makefile
parent3c3dd225819112e56554162c6b37e61a31924e0c (diff)
parent966458f89d84ef5792893a01e2b7a5218c7b311d (diff)
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.
Diffstat (limited to 'arch/avr32/lib/Makefile')
0 files changed, 0 insertions, 0 deletions