Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits) ARM: mach-shmobile: specify CHCLR registers on SH7372 dma: shdma: fix runtime PM: clear channel buffers on reset dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit dmaengine/ste_dma40: clear LNK on channel startup dmaengine: intel_mid_dma: remove legacy pm interface ASoC: mxs: correct 'direction' of device_prep_dma_cyclic dmaengine: intel_mid_dma: error path fix dmaengine: intel_mid_dma: locking and freeing fixes mtd: gpmi-nand: move to dma_transfer_direction mtd: fix compile error for gpmi-nand mmc: mxs-mmc: fix the dma_transfer_direction migration dmaengine: add DMA_TRANS_NONE to dma_transfer_direction dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled. dma: mxs-dma: fix a typo in comment DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove video i.MX IPU: Fix display connections i.MX IPU DMA: Fix wrong burstsize settings dmaengine/ste_dma40: allow fixed physical channel ... Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c} The conflicts looked pretty trivial, but I'll ask people to verify them.		2012-01-17 18:40:24 -08:00
..
aty	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
backlight	backlight: convert pwm_bl to dev_pm_ops	2012-01-10 16:30:48 -08:00
console	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-01-14 13:05:21 -08:00
geode
i810	module_param: make bool parameters really bool (drivers/video/i810)	2012-01-12 23:28:59 +00:00
intelfb	intelfbdrv.c: bailearly is an int module_param	2012-01-13 09:32:28 +10:30
kyro
logo	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
matrox	fbdev: matroxfb: Fix compilation after fb_var_screeninfo change	2011-12-21 02:26:11 +00:00
mb862xx
mbx	video: convert mbxfb to use module_platform_driver()	2011-12-19 20:21:43 +00:00
msm
nvidia	drivers/video/nvidia/nvidia.c: fix warning	2012-01-12 20:13:03 -08:00
omap	Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6	2012-01-14 15:11:19 -08:00
omap2	Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6	2012-01-14 15:11:19 -08:00
pnx4008	video: pnx4008: convert drivers/video/pnx4008/* to use module_platform_driver()	2011-12-19 20:21:43 +00:00
riva	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
savage
sis
vermilion
via	viafb: correct sync polarity for OLPC DCON	2011-11-22 00:56:17 +00:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c	fbdev: amba: Enable module alias autogeneration for AMBA drivers	2011-11-22 10:58:33 +00:00
amifb.c	fbdev/amifb: Use framebuffer_alloc()	2011-12-03 22:03:32 +00:00
arcfb.c
arkfb.c
asiliantfb.c
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c
atafb.h
atmel_lcdfb.c	Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."	2012-01-11 22:29:30 +00:00
au1100fb.c	MIPS: Alchemy: one kernel for DB1000/DB1500/DB1100	2011-12-07 22:02:07 +00:00
au1100fb.h
au1200fb.c	MIPS: Alchemy: move au1200fb global functions to platform data	2011-12-07 22:02:07 +00:00
au1200fb.h
bf54x-lq043fb.c	treewide: Fix comment and string typo 'bufer'	2011-12-06 09:53:40 +01:00
bf537-lq035.c
bfin_adv7393fb.c
bfin_adv7393fb.h
bfin-lq035q1-fb.c
bfin-t350mcqb-fb.c	treewide: Fix comment and string typo 'bufer'	2011-12-06 09:53:40 +01:00
broadsheetfb.c
bt431.h
bt455.h
bw2.c
c2p_core.h
c2p_iplan2.c
c2p_planar.c
c2p.h
carminefb_regs.h
carminefb.c
carminefb.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c
cg6.c
cg14.c
chipsfb.c
cirrusfb.c	Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6	2012-01-14 15:11:19 -08:00
clps711xfb.c
cobalt_lcdfb.c
controlfb.c	Drivers: video: controlfb: fixed a brace coding style issue	2011-11-22 01:00:16 +00:00
controlfb.h
cyber2000fb.c
cyber2000fb.h
da8xx-fb.c	video:da8xx-fb: Disable and reset sequence on version2 of LCDC	2011-11-22 00:55:53 +00:00
dnfb.c
edid.h
efifb.c
ep93xx-fb.c
epson1355fb.c
fb_ddc.c
fb_defio.c
fb_draw.h
fb_notify.c
fb_sys_fops.c
fb-puv3.c
fbcmap.c
fbcvt.c
fbmem.c	fbdev: Add FOURCC-based format configuration API	2011-12-19 20:07:13 +00:00
fbmon.c
fbsysfs.c
ffb.c
fm2fb.c
fsl-diu-fb.c	drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()	2012-01-03 15:59:09 +00:00
g364fb.c
gbefb.c
grvga.c	grvga: fix section mismatch warnings	2012-01-03 16:02:55 +00:00
gxt4500.c
hecubafb.c
hgafb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
hitfb.c
hpfb.c
igafb.c
imsttfb.c
imxfb.c
jz4740_fb.c
Kconfig	Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6	2012-01-14 15:11:19 -08:00
leo.c
macfb.c
macmodes.c
macmodes.h
Makefile
maxinefb.c
metronomefb.c
modedb.c
mx3fb.c	video i.MX IPU: Fix display connections	2011-12-08 12:59:03 +05:30
mxsfb.c	Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6	2012-01-14 15:11:19 -08:00
n411.c
neofb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
nuc900fb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
nuc900fb.h
offb.c	offb: Fix setting of the pseudo-palette for >8bpp	2012-01-03 12:09:25 +11:00
output.c
p9100.c
platinumfb.c
platinumfb.h
pm2fb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
pm3fb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c
pvr2fb.c
pxa3xx-gcu.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
pxa3xx-gcu.h
pxa168fb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
pxa168fb.h
pxafb.c
pxafb.h
q40fb.c
s1d13xxxfb.c
s3c2410fb.c	video: s3c2410: fix checkpatch error and warnings	2011-12-03 22:10:43 +00:00
s3c2410fb.h
s3c-fb.c	video: s3c-fb: Don't keep device runtime active when open	2012-01-03 16:00:05 +00:00
s3fb.c	s3fb: fix Virge/VX	2011-12-21 02:25:21 +00:00
sa1100fb.c
sa1100fb.h
sbuslib.c	Drivers: video: sbuslib: fixed a brace coding style issue	2011-11-22 01:00:24 +00:00
sbuslib.h
sgivwfb.c
sh7760fb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
sh_mipi_dsi.c	fbdev: sh_mipi_dsi: fixup setup timing DSICTRL	2011-11-21 23:43:22 +00:00
sh_mobile_hdmi.c
sh_mobile_lcdcfb.c	fbdev: sh_mobile_lcdc: Support FOURCC-based format API	2011-12-19 20:07:13 +00:00
sh_mobile_lcdcfb.h
sh_mobile_meram.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
skeletonfb.c
sm501fb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
smscufx.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
sstfb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
sticore.h
stifb.c
sunxvr500.c
sunxvr1000.c
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c
tdfxfb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
tgafb.c
tmiofb.c
tridentfb.c
udlfb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
uvesafb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
valkyriefb.c
valkyriefb.h
vesafb.c
vfb.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
vga16fb.c
vgastate.c
vt8500lcdfb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
vt8500lcdfb.h
vt8623fb.c
w100fb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
w100fb.h
wm8505fb_regs.h
wm8505fb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
wmt_ge_rops.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00
wmt_ge_rops.h
xen-fbfront.c	Xen: consolidate and simplify struct xenbus_driver instantiation	2012-01-04 17:01:17 -05:00
xilinxfb.c	video: convert drivers/video/* to use module_platform_driver()	2011-12-03 22:08:42 +00:00