linux/drivers/video/backlight
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
88pm860x_bl.c
Kconfig
Makefile
aat2870_bl.c
adp5520_bl.c
adp8860_bl.c
adp8870_bl.c video/backlight: remove obsolete cleanup for clientdata 2011-10-31 17:30:54 -07:00
adx_bl.c
ams369fg06.c
apple_bl.c
atmel-pwm-bl.c
backlight.c
corgi_lcd.c
cr_bllcd.c
da903x_bl.c
ep93xx_bl.c
generic_bl.c backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity() 2011-10-31 17:30:54 -07:00
hp680_bl.c
ili9320.c
ili9320.h
jornada720_bl.c
jornada720_lcd.c
kb3886_bl.c
l4f00242t03.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
lcd.c
ld9040.c
ld9040_gamma.h
lms283gf05.c
locomolcd.c
ltv350qv.c
ltv350qv.h
max8925_bl.c
omap1_bl.c
pcf50633-backlight.c
platform_lcd.c
progear_bl.c
pwm_bl.c
s6e63m0.c
s6e63m0_gamma.h
tdo24m.c
tosa_bl.c
tosa_lcd.c
vgg2432a4.c
wm831x_bl.c