OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b5f15ac4f8
linux/include/video
History
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 atmel_lcdfb: change irq_base definition to allow error reporting 2008-11-12 17:17:16 -08:00
aty128.h atyfb: fix header file trailing whitespace 2009-04-01 08:59:26 -07:00
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 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
da8xx-fb.h fbdev: da8xx/omap-l1xx: implement double buffering 2010-05-25 08:07:09 -07:00
edid.h Make asm-x86/bootparam.h includable from userspace. 2007-10-23 15:49:47 +10:00
epson1355.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
gbe.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hecubafb.h fbdev: platforming hecubafb and n411 2008-04-28 08:58:41 -07:00
iga.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ili9320.h fb: add support for the ILI9320 video display controller 2008-07-24 10:47:40 -07:00
Kbuild include: replace unifdef-y with header-y 2010-08-14 22:26:51 +02:00
kyro.h [PATCH] fbdev: kyrofb: Driver cleanups 2006-01-10 08:01:45 -08:00
mach64.h atyfb: fix CONFIG_ namespace violations 2009-02-05 12:56:48 -08:00
maxinefb.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mbxfb.h mbxfb: Improvements and new features 2007-10-16 09:43:14 -07:00
metronomefb.h [ARM] 5209/1: metronomefb: changes to use platform framebuffer 2008-08-26 17:01:12 +01:00
mipi_display.h fbdev: add a MIPI DSI header 2010-05-24 08:47:38 +09:00
neomagic.h neofb: remove open_lock mutex 2008-10-16 11:21:42 -07:00
newport.h fbdev: newport: newport_*wait() return 0 on timeout 2009-04-01 08:59:31 -07:00
permedia2.h pm2fb: hardware cursor support for the Permedia2 2007-10-16 09:43:18 -07:00
platform_lcd.h lcd: add platform_lcd driver 2008-07-24 10:47:40 -07:00
pm3fb.h pm3fb: header file cleanup 2007-10-16 09:43:18 -07:00
pmag-ba-fb.h [PATCH] DEC PMAG BA frame buffer update 2005-09-05 00:06:03 -07:00
pmagb-b-fb.h [PATCH] DEC PMAGB B framebuffer update 2005-09-05 00:06:03 -07:00
pxa168fb.h pxa168fb: remove useless vsync/hsync invert flag 2009-12-01 09:02:32 +08:00
radeon.h atyfb: fix header file trailing whitespace 2009-04-01 08:59:26 -07:00
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 headers_check fix: video/sisfb.h 2009-01-31 00:14:28 +05:30
sstfb.h define global BIT macro 2007-10-19 11:53:42 -07:00
tdfx.h tdfxfb: move I2C functionality into the tdfxfb 2009-04-07 08:31:08 -07:00
tgafb.h tgafb: actually allocate memory for the pseudo_palette 2007-07-17 10:23:12 -07:00
trident.h tridentfb: add imageblit acceleration for Blade3D family 2008-07-24 10:47:36 -07:00
uvesafb.h headers_check fix: video/uvesafb.h 2009-01-31 00:14:52 +05:30
vga.h include/video/vga.h: update web address. 2010-08-16 15:15:18 +02:00
w100fb.h [PATCH] SharpSL: Abstract c7x0 specifics from Corgi Touchscreen driver 2005-09-13 08:22:31 -07:00