linux/include/video
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
atmel_lcdc.h
aty128.h
broadsheetfb.h broadsheetfb: support storing waveform 2010-03-12 15:52:34 -08:00
cirrus.h cirrusfb: Laguna chipset 8bpp fix 2009-04-01 08:59:27 -07:00
cvisionppc.h
da8xx-fb.h fbdev: da8xx/omap-l1xx: implement double buffering 2010-05-25 08:07:09 -07:00
edid.h
epson1355.h
gbe.h
hecubafb.h
iga.h
ili9320.h
Kbuild include: replace unifdef-y with header-y 2010-08-14 22:26:51 +02:00
kyro.h
mach64.h
maxinefb.h
mbxfb.h
metronomefb.h
mipi_display.h fbdev: add a MIPI DSI header 2010-05-24 08:47:38 +09:00
neomagic.h
newport.h fbdev: newport: newport_*wait() return 0 on timeout 2009-04-01 08:59:31 -07:00
permedia2.h
platform_lcd.h
pm3fb.h
pmag-ba-fb.h
pmagb-b-fb.h
pxa168fb.h pxa168fb: remove useless vsync/hsync invert flag 2009-12-01 09:02:32 +08:00
radeon.h
s1d13xxxfb.h fbdev: s1d13xxxfb: add accelerated bitblt functions 2009-06-16 19:48:00 -07:00
sgivw.h sgivwfb: Make use of ARRAY_SIZE. 2009-12-04 15:39:52 +01:00
sh_mipi_dsi.h sh-mobile: add support for displays, connected over the MIPI bus 2010-05-24 08:49:05 +09:00
sh_mobile_hdmi.h fbdev: sh-mobile: HDMI support for SH-Mobile SoCs 2010-08-04 16:12:15 +09:00
sh_mobile_lcdc.h sh: add a parameter to LCDC driver's .display_on() callback 2010-08-04 16:12:11 +09:00
sisfb.h
sstfb.h
tdfx.h tdfxfb: move I2C functionality into the tdfxfb 2009-04-07 08:31:08 -07:00
tgafb.h
trident.h
uvesafb.h
vga.h include/video/vga.h: update web address. 2010-08-16 15:15:18 +02:00
w100fb.h