linux/include/drm
Linus Torvalds 98793265b4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
i2c
ttm
Kbuild
drm.h
drmP.h
drm_buffer.h
drm_cache.h
drm_core.h
drm_crtc.h
drm_crtc_helper.h
drm_dp_helper.h
drm_edid.h
drm_encoder_slave.h
drm_fb_helper.h
drm_fixed.h
drm_global.h
drm_hashtab.h
drm_mem_util.h
drm_memory.h
drm_mm.h
drm_mode.h
drm_os_linux.h
drm_pciids.h
drm_sarea.h
drm_sman.h
drm_sysfs.h
drm_usb.h
exynos_drm.h
i810_drm.h
i915_drm.h
intel-gtt.h
mga_drm.h
nouveau_drm.h
r128_drm.h
radeon_drm.h
savage_drm.h
sis_drm.h
via_drm.h
vmwgfx_drm.h