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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	fbdev: move logo externs to header file	2009-06-16 19:47:57 -07:00
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	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
acornfb.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
acornfb.h
amba-clcd.c	Merge branches 'fixes', 'pgt-next' and 'versatile' into devel	2011-03-20 09:32:12 +00:00
amifb.c	m68k: amiga - Frame buffer platform device conversion	2010-05-17 21:37:43 +02:00
arcfb.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
arkfb.c	arkfb: Compute VGA base iomem pointer explicitly.	2011-03-22 15:47:55 +09:00
asiliantfb.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c	fbdev: atafb - Remove undead ifdef ATAFB_FALCON	2010-10-22 09:43:25 +02:00
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	VIDEO: Au1100fb: Fix section mismatch	2010-07-26 19:08:15 +01:00
au1100fb.h
au1200fb.c	replace nested max/min macros with {max,min}3 macro	2010-10-26 16:52:12 -07:00
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	fbdev: bfin_adv7393fb: new Blackfin ADV7393 driver	2010-11-26 15:06:39 +09:00
bfin_adv7393fb.h	fbdev: bfin_adv7393fb: new Blackfin ADV7393 driver	2010-11-26 15:06:39 +09:00
bfin-lq035q1-fb.c	fbdev: bfin-lq035q1-fb: respect new PPI mode platform field	2010-05-25 08:07:08 -07:00
bfin-t350mcqb-fb.c	backlight: add backlight type	2011-03-22 17:43:59 -07:00
broadsheetfb.c	broadsheetfb: support storing waveform	2010-03-12 15:52:34 -08:00
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	fbdev: c2p/atafb - Add support for Atari interleaved bitplanes	2009-01-12 20:56:31 +01:00
c2p_iplan2.c	fbdev: c2p/atafb - Add support for Atari interleaved bitplanes	2009-01-12 20:56:31 +01:00
c2p_planar.c	fbdev: c2p - Rename c2p to c2p_planar	2009-01-12 20:56:32 +01:00
c2p.h	fbdev: c2p - Rename c2p to c2p_planar	2009-01-12 20:56:32 +01:00
carminefb_regs.h
carminefb.c	drivers/video/carminefb.c: improve error handling	2011-01-06 15:46:56 +09:00
carminefb.h
cfbcopyarea.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
cfbfillrect.c	fbdev: fix fillrect for 24bpp modes	2009-05-06 16:36:10 -07:00
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	m68k: amiga - Zorro bus modalias support	2010-05-17 21:37:41 +02:00
clps711xfb.c	clps711xfb: convert to proc_fops	2009-12-16 07:20:04 -08:00
cobalt_lcdfb.c	cocbalt_lcdfb: correct sections	2010-05-03 15:42:58 +02:00
controlfb.c	of/address: Clean up function declarations	2010-08-01 01:42:42 -06:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
edid.h	video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET	2011-03-22 16:45:03 +09:00
efifb.c	efifb: support the EFI framebuffer on more Apple hardware	2010-09-22 17:22:39 -07:00
ep93xx-fb.c	ARM: 6616/1: Fix ep93xx-fb init/exit annotations	2011-01-11 12:26:58 +00:00
epson1355fb.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
fb_ddc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
fb_defio.c	workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()	2010-12-15 10:56:11 +01:00
fb_draw.h	fbdev: fix fillrect for 24bpp modes	2009-05-06 16:36:10 -07:00
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	framebuffer: fix fbcmap.c kernel-doc warning	2010-11-26 15:05:08 +09:00
fbcvt.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
fbmem.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
fbmon.c	fbdev: when parsing E-EDID blocks, also use SVD entries	2010-11-15 14:52:23 +09:00
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	m68k: amiga - Zorro bus modalias support	2010-05-17 21:37:41 +02:00
fsl-diu-fb.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
g364fb.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
gbefb.c	drivers/video/gbefb.c: eliminate memory leak	2010-10-27 18:03:08 -07:00
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	hitfb: fix sections	2010-05-25 08:07:09 -07:00
hpfb.c	video: hpfb: use resource_size()	2011-03-22 16:07:32 +09:00
igafb.c	drivers/video/igafb.c: make igafb_setup() and igafb_init() static	2010-08-11 08:59:12 -07:00
imsttfb.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	macfb: fix 24-bit visual and stuff	2010-02-27 18:31:16 +01:00
macmodes.c	fbdev: add some missing mac modes	2010-02-27 18:31:14 +01:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	NUC900 LCD Controller Driver	2010-03-12 15:52:34 -08:00
offb.c	of/address: Clean up function declarations	2010-08-01 01:42:42 -06:00
output.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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	tree-wide: s/widht/width/g typo in comments	2010-02-05 12:22:42 +01:00
pm3fb.c
pmag-aa-fb.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pmag-ba-fb.c	VIDEO: PMAG-BA: Fix section mismatch	2010-07-26 19:08:14 +01:00
pmagb-b-fb.c	VIDEO: PMAGB-B: Fix section mismatch	2010-07-26 19:08:15 +01:00
ps3fb.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
pvr2fb.c	sh: Fix up more 64-bit pgprot truncation on SH-X2 TLB.	2010-02-17 13:23:00 +09:00
pxa3xx-gcu.c	video: pxa3xx-gcu: Return -EFAULT when copy_from_user() fails	2011-01-18 13:40:34 +09:00
pxa3xx-gcu.h	video: add driver for PXA3xx 2D graphics accelerator	2010-12-16 14:31:18 +08:00
pxa168fb.c	video: pxa168fb: remove a redundant pxa168fb_check_var call	2011-01-25 15:09:19 +09:00
pxa168fb.h	fb: add support of LCD display controller on pxa168/910 (base layer)	2009-06-13 00:09:09 +08:00
pxafb.c	[ARM] pxafb: fix building issue of incorrect reference	2009-12-29 14:11:27 +08:00
pxafb.h
q40fb.c	fbdev/m68k: Fix section mismatches in q40fb.c	2010-10-22 09:43:25 +02:00
s1d13xxxfb.c	s1d13xxxfb: drop unused code	2010-12-21 01:05:43 +09:00
s3c2410fb.c	s3c2410fb: don't treat NULL clk as an error	2011-01-12 15:00:31 +09:00
s3c2410fb.h	s3c-fb: CPUFREQ frequency scaling support	2009-06-16 19:47:59 -07:00
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	platform-drivers: move probe to .devinit.text in drivers/video	2010-03-07 17:04:50 -08:00
sa1100fb.h	sa1100fb: fix color component length for pseudocolor modes	2009-04-13 15:04:29 -07:00
sbuslib.c
sbuslib.h
sgivwfb.c	sgivwfb: fix sections	2010-05-25 08:07:09 -07:00
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	fbdev: fix color component field length documentation	2009-04-13 15:04:29 -07:00
sm501fb.c	video, sm501: add OF binding to support SM501	2011-03-22 17:17:14 +09:00
sstfb.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
sticore.h
stifb.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
sunxvr500.c	Merge branch 'master' into export-slabh	2010-04-05 11:37:28 +09:00
sunxvr1000.c	dt/video: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:45 -07:00
sunxvr2500.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
svgalib.c	svga: Make svga_set_timings() take an iomem regbase pointer.	2011-03-22 15:47:22 +09:00
syscopyarea.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sysfillrect.c	fbdev: fix fillrect for 24bpp modes	2009-05-06 16:36:10 -07:00
sysimgblt.c
tcx.c	video: add missing framebuffer_release in error path	2011-03-22 16:35:44 +09:00
tdfxfb.c	VIDEO: Correct use of request_region/request_mem_region	2010-08-05 13:25:38 +01:00
tgafb.c	fix typos concerning "initiali[zs]e"	2010-06-16 18:05:05 +02:00
tmiofb.c	tmio: Silence warnings introduced by mfd changes	2011-03-23 10:42:01 +01:00
tridentfb.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
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: various fixes	2010-02-27 18:31:13 +01:00
valkyriefb.h	valkyriefb: various fixes	2010-02-27 18:31:13 +01:00
vesafb.c	uvesafb,vesafb: create WC or WB PAT-entries	2011-03-22 16:20:44 +09:00
vfb.c	fbdev: section cleanup in vfb	2010-05-25 08:07:08 -07:00
vga16fb.c	fbdev: section cleanup in vga16fb	2010-05-25 08:07:08 -07:00
vgastate.c
vt8500lcdfb.c	fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb	2011-01-13 13:07:41 +09:00
vt8500lcdfb.h	ARM: Add support for the display controllers in VT8500 and WM8505	2010-11-09 18:52:07 +09:00
vt8623fb.c	vt8623fb: Compute VGA base iomem pointer explicitly.	2011-03-22 15:47:59 +09:00
w100fb.c	drivers/video/w100fb.c: ignore void return value / fix build failure	2010-08-09 20:44:53 -07:00
w100fb.h
wm8505fb_regs.h	ARM: Add support for the display controllers in VT8500 and WM8505	2010-11-09 18:52:07 +09:00
wm8505fb.c	fbdev: Modify vsync timing calculation in wm8505fb	2010-12-21 01:05:48 +09:00
wmt_ge_rops.c	fbdev: Minor cleanup in WM8505-related code	2010-12-21 01:05:43 +09:00
wmt_ge_rops.h	ARM: Add support for the display controllers in VT8500 and WM8505	2010-11-09 18:52:07 +09:00
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