kernel-ark/drivers/video/omap
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
..
blizzard.c omap: use list_move() instead of list_del()/list_add() combination 2011-03-22 15:13:35 +09:00
dispc.c OMAPFB: fix compilation warnings due to missing include 2011-11-18 10:09:17 +02:00
dispc.h
hwa742.c omap: use list_move() instead of list_del()/list_add() combination 2011-03-22 15:13:35 +09:00
Kconfig OMAPFB: Remove unused lcd drivers 2011-09-30 16:17:28 +03:00
lcd_ams_delta.c
lcd_h3.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_htcherald.c
lcd_inn1510.c
lcd_inn1610.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_mipid.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
lcd_osk.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_palmte.c
lcd_palmtt.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
lcd_palmz71.c
lcdc.c OMAPFB: LCDC: change update_mode to DISABLED when going suspend 2010-06-15 10:17:19 +03:00
lcdc.h
Makefile OMAPDSS: Port the Apollon display driver to DSS2 2011-09-30 16:17:29 +03:00
omapfb_main.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
omapfb.h
rfbi.c misc latin1 to utf8 conversions 2012-01-02 13:04:55 +01:00
sossi.c misc latin1 to utf8 conversions 2012-01-02 13:04:55 +01:00