2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
linux-next/drivers/gpu/drm/vmwgfx
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
..
Kconfig drm/vmwgfx: depends on FB 2010-03-15 10:35:04 +10:00
Makefile drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
svga3d_reg.h
svga_escape.h
svga_overlay.h
svga_reg.h
svga_types.h
vmwgfx_buffer.c drm/ttm: remove io_ field from TTM V6 2010-04-20 14:13:09 +10:00
vmwgfx_drv.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
vmwgfx_drv.h vmwgfx: Enable use of the vblank system 2010-10-01 21:08:51 +10:00
vmwgfx_execbuf.c drm/vmwgfx: return -EFAULT for copy_to_user errors 2010-06-08 09:33:41 +10:00
vmwgfx_fb.c vmwgfx: Fix fb VRAM pinning failure due to fragmentation 2010-10-01 21:08:55 +10:00
vmwgfx_fence.c drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
vmwgfx_fifo.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
vmwgfx_gmr.c drm/vmwgfx: Add DRM driver for VMware Virtual GPU 2009-12-15 08:38:43 +10:00
vmwgfx_ioctl.c drm/vmwgfx: Update the user-space interface. 2010-02-11 11:58:09 +10:00
vmwgfx_irq.c drm/vmwgfx: Add kernel throttling support. Bump minor. 2010-06-01 09:37:15 +10:00
vmwgfx_kms.c vmwgfx: Enable use of the vblank system 2010-10-01 21:08:51 +10:00
vmwgfx_kms.h drm/vmwgfx: Allow userspace to change default layout. Bump minor. 2010-06-03 13:13:36 +10:00
vmwgfx_ldu.c vmwgfx: Enable use of the vblank system 2010-10-01 21:08:51 +10:00
vmwgfx_overlay.c drm/vmwgfx: Unpause overlay on update. 2010-06-01 09:37:47 +10:00
vmwgfx_reg.h drm/vmwgfx: Add DRM driver for VMware Virtual GPU 2009-12-15 08:38:43 +10:00
vmwgfx_resource.c vmwgfx: vt-switch (master drop) fixes 2010-10-01 21:08:50 +10:00
vmwgfx_ttm_glue.c drivers/gpu/drm: Remove unnecessary casts of private_data 2010-09-23 13:35:26 +02:00