kernel-ark/drivers/video/omap
Linus Torvalds 23d69b09b7 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
  usb: don't use flush_scheduled_work()
  speedtch: don't abuse struct delayed_work
  media/video: don't use flush_scheduled_work()
  media/video: explicitly flush request_module work
  ioc4: use static work_struct for ioc4_load_modules()
  init: don't call flush_scheduled_work() from do_initcalls()
  s390: don't use flush_scheduled_work()
  rtc: don't use flush_scheduled_work()
  mmc: update workqueue usages
  mfd: update workqueue usages
  dvb: don't use flush_scheduled_work()
  leds-wm8350: don't use flush_scheduled_work()
  mISDN: don't use flush_scheduled_work()
  macintosh/ams: don't use flush_scheduled_work()
  vmwgfx: don't use flush_scheduled_work()
  tpm: don't use flush_scheduled_work()
  sonypi: don't use flush_scheduled_work()
  hvsi: don't use flush_scheduled_work()
  xen: don't use flush_scheduled_work()
  gdrom: don't use flush_scheduled_work()
  ...

Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.
2011-01-07 16:58:04 -08:00
..
blizzard.c drivers/video/omap/blizzard.c: suspected typo in assignment 2010-10-27 18:03:08 -07:00
dispc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dispc.h omapfb: dispc: allow multiple external IRQ handlers 2009-09-23 07:39:50 -07:00
hwa742.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
Kconfig OMAP: OMAPFB: disable old omapfb for OMAP4 builds 2010-12-15 11:17:08 +02:00
lcd_2430sdp.c mfd: Rename all twl4030_i2c* 2009-12-13 21:23:33 +01:00
lcd_ams_delta.c omapfb: lcd_ams_delta: add support for contrast control 2010-02-12 12:46:07 +02:00
lcd_apollon.c omap: mux: Mux Apollon LCD power in board-apollon.c 2010-07-05 16:31:39 +03:00
lcd_h3.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_h4.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_htcherald.c video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c 2010-01-11 14:45:25 +02:00
lcd_inn1510.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_inn1610.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_ldp.c mfd: twl: fix twl4030 rename for remaining driver, board files 2009-12-16 12:44:04 -08:00
lcd_mipid.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
lcd_omap2evm.c mfd: twl: fix twl4030 rename for remaining driver, board files 2009-12-16 12:44:04 -08:00
lcd_omap3beagle.c video/omap: remove mux.h include 2010-10-22 23:21:02 +03:00
lcd_omap3evm.c mfd: twl: fix twl4030 rename for remaining driver, board files 2009-12-16 12:44:04 -08:00
lcd_osk.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_overo.c mfd: twl: fix twl4030 rename for remaining driver, board files 2009-12-16 12:44:04 -08:00
lcd_palmte.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_palmtt.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcd_palmz71.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
lcdc.c OMAPFB: LCDC: change update_mode to DISABLED when going suspend 2010-06-15 10:17:19 +03:00
lcdc.h [ARM] omap: fix a load of "warning: symbol 'xxx' was not declared. Should it be static?" 2008-09-05 17:02:34 +01:00
Makefile omap1: Add board support and LCD for HTC Herald 2009-11-22 10:24:33 -08:00
omapfb_main.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
omapfb.h OMAP: OMAPFB: fix clk_get for RFBI 2010-01-11 13:33:09 +02:00
rfbi.c OMAP: OMAPFB: fix rfbi.c compile error 2010-06-15 10:17:25 +03:00
sossi.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00