Linus Torvalds 76d21c5635 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c		2011-03-24 09:50:13 -07:00
..
aty	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6	2011-03-24 07:56:52 -07:00
backlight	mfd: Adopt mfd_data in 88pm860x backlight	2011-03-23 10:42:05 +01:00
console	fbcon: fix situation where fbcon gets deinitialised and can't reinit.	2011-03-22 17:22:19 +09:00
display
geode	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
i810	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
intelfb	video: change to new flag variable	2011-03-17 14:05:35 +01:00
kyro
logo
matrox	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-03-24 09:50:13 -07:00
mb862xx	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
mbx
msm	msm: mdp: Set the correct pack pattern for XRGB/ARGB	2011-03-08 11:54:46 -08:00
nvidia	backlight: add backlight type	2011-03-22 17:43:59 -07:00
omap	omap: use list_move() instead of list_del()/list_add() combination	2011-03-22 15:13:35 +09:00
omap2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6	2011-03-24 07:56:52 -07:00
pnx4008
riva	backlight: add backlight type	2011-03-22 17:43:59 -07:00
savage	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
sis	sisfb: add support for XGI Z9 DDR2 POST	2011-03-22 15:21:01 +09:00
vermilion	vmlfb: use list_move() instead of list_del()/list_add() combination	2011-03-22 15:13:38 +09:00
via	kstrto*: converting strings to integers done (hopefully) right	2011-03-22 17:44:14 -07:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c	Merge branches 'fixes', 'pgt-next' and 'versatile' into devel	2011-03-20 09:32:12 +00:00
amifb.c
arcfb.c
arkfb.c	arkfb: Compute VGA base iomem pointer explicitly.	2011-03-22 15:47:55 +09:00
asiliantfb.c
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c
atafb.h
atmel_lcdfb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6	2011-03-24 07:56:52 -07:00
au1100fb.c
au1100fb.h
au1200fb.c
au1200fb.h
bf54x-lq043fb.c	backlight: add backlight type	2011-03-22 17:43:59 -07:00
bf537-lq035.c	drivers/video/bf537-lq035.c: Add missing IS_ERR test	2011-01-25 15:09:24 +09:00
bfin_adv7393fb.c
bfin_adv7393fb.h
bfin-lq035q1-fb.c
bfin-t350mcqb-fb.c	backlight: add backlight type	2011-03-22 17:43:59 -07:00
broadsheetfb.c
bt431.h
bt455.h
bw2.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
c2p_core.h
c2p_iplan2.c
c2p_planar.c
c2p.h
carminefb_regs.h
carminefb.c	drivers/video/carminefb.c: improve error handling	2011-01-06 15:46:56 +09:00
carminefb.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
cg6.c	video: add missing framebuffer_release in error path	2011-03-22 16:35:44 +09:00
cg14.c	video: add missing framebuffer_release in error path	2011-03-22 16:35:44 +09:00
chipsfb.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
cirrusfb.c
clps711xfb.c
cobalt_lcdfb.c
controlfb.c
controlfb.h
cyber2000fb.c	VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()	2011-02-11 10:16:07 +00:00
cyber2000fb.h	VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()	2011-02-11 10:16:07 +00:00
da8xx-fb.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
dnfb.c
edid.h	video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET	2011-03-22 16:45:03 +09:00
efifb.c
ep93xx-fb.c	ARM: 6616/1: Fix ep93xx-fb init/exit annotations	2011-01-11 12:26:58 +00:00
epson1355fb.c
fb_ddc.c
fb_defio.c
fb_draw.h
fb_notify.c
fb_sys_fops.c
fb-puv3.c	unicore32 machine related: add frame buffer driver for pkunity-v3 soc	2011-03-17 09:19:20 +08:00
fbcmap.c
fbcvt.c
fbmem.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
fbmon.c
fbsysfs.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
ffb.c	video: ffb: fix ffb_probe error path	2011-03-22 16:18:51 +09:00
fm2fb.c
fsl-diu-fb.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
g364fb.c
gbefb.c
gxt4500.c
hecubafb.c	video: hecubafb: add __devexit_p around reference to hecubafb_remove	2011-03-22 16:34:28 +09:00
hgafb.c	video: Fix the HGA framebuffer driver	2011-01-06 15:48:13 +09:00
hitfb.c
hpfb.c	video: hpfb: use resource_size()	2011-03-22 16:07:32 +09:00
igafb.c
imsttfb.c
imxfb.c	backlight: add backlight type	2011-03-22 17:43:59 -07:00
jz4740_fb.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
Kconfig	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
leo.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
macfb.c
macmodes.c
macmodes.h
Makefile	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
maxinefb.c
metronomefb.c	video: metronomefb: add __devexit_p around reference to metronomefb_remove	2011-03-22 16:34:33 +09:00
modedb.c	video: tidy up modedb formatting.	2011-01-12 14:57:52 +09:00
mx3fb.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
mxsfb.c	video: Add i.MX23/28 framebuffer driver	2011-03-07 19:29:30 +01:00
n411.c
neofb.c
nuc900fb.c	video: nuc900fb: properly free resources in nuc900fb_remove	2011-01-18 13:38:06 +09:00
nuc900fb.h
offb.c
output.c
p9100.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
platinumfb.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
platinumfb.h
pm2fb.c
pm3fb.c
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
pvr2fb.c
pxa3xx-gcu.c	video: pxa3xx-gcu: Return -EFAULT when copy_from_user() fails	2011-01-18 13:40:34 +09:00
pxa3xx-gcu.h
pxa168fb.c	video: pxa168fb: remove a redundant pxa168fb_check_var call	2011-01-25 15:09:19 +09:00
pxa168fb.h
pxafb.c
pxafb.h
q40fb.c
s1d13xxxfb.c
s3c2410fb.c	s3c2410fb: don't treat NULL clk as an error	2011-01-12 15:00:31 +09:00
s3c2410fb.h
s3c-fb.c	video: s3c-fb: return proper error if clk_get fails	2011-03-22 16:22:45 +09:00
s3fb.c	s3fb: use new start address register	2011-03-22 15:50:00 +09:00
sa1100fb.c
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
sh7760fb.c	video: sh7760fb: use resource_size()	2011-03-22 16:07:35 +09:00
sh_mipi_dsi.c	fbdev: sh_mipi_dsi: use platform provided register layout and values	2011-01-05 17:22:32 +09:00
sh_mobile_hdmi.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
sh_mobile_lcdcfb.c	fbdev: sh_mobile_lcdc: checking NULL instead of IS_ERR()	2011-03-22 16:08:48 +09:00
sh_mobile_lcdcfb.h	fbdev: sh_mobile_lcdc: Add YUV framebuffer support	2011-03-16 17:27:10 +09:00
skeletonfb.c
sm501fb.c	video, sm501: add OF binding to support SM501	2011-03-22 17:17:14 +09:00
sstfb.c
sticore.h
stifb.c
sunxvr500.c
sunxvr1000.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
sunxvr2500.c
svgalib.c	svga: Make svga_set_timings() take an iomem regbase pointer.	2011-03-22 15:47:22 +09:00
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c	video: add missing framebuffer_release in error path	2011-03-22 16:35:44 +09:00
tdfxfb.c
tgafb.c
tmiofb.c	tmio: Silence warnings introduced by mfd changes	2011-03-23 10:42:01 +01:00
tridentfb.c
udlfb.c	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
uvesafb.c	uvesafb,vesafb: create WC or WB PAT-entries	2011-03-22 16:20:44 +09:00
valkyriefb.c
valkyriefb.h
vesafb.c	uvesafb,vesafb: create WC or WB PAT-entries	2011-03-22 16:20:44 +09:00
vfb.c
vga16fb.c
vgastate.c
vt8500lcdfb.c	fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb	2011-01-13 13:07:41 +09:00
vt8500lcdfb.h
vt8623fb.c	vt8623fb: Compute VGA base iomem pointer explicitly.	2011-03-22 15:47:59 +09:00
w100fb.c
w100fb.h
wm8505fb_regs.h
wm8505fb.c
wmt_ge_rops.c
wmt_ge_rops.h
xen-fbfront.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
xilinxfb.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00