kernel_optimize_test/drivers/hwmon
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
..
pmbus
abituguru3.c
abituguru.c
acpi_power_meter.c
ad7314.c
ad7414.c
ad7418.c
adcxx.c
adm1021.c
adm1025.c
adm1026.c
adm1029.c
adm1031.c
adm9240.c
ads1015.c
ads7828.c
ads7871.c
adt7411.c
adt7462.c
adt7470.c
adt7475.c
amc6821.c
applesmc.c
asb100.c
asc7621.c
asus_atk0110.c
atxp1.c
coretemp.c
dme1737.c
ds620.c
ds1621.c
emc6w201.c
emc1403.c
emc2103.c
exynos4_tmu.c
f71805f.c
f71882fg.c
f75375s.c
fam15h_power.c
fschmd.c
g760a.c
gl518sm.c
gl520sm.c
gpio-fan.c
hwmon-vid.c
hwmon.c
i5k_amb.c
ibmaem.c
ibmpex.c
it87.c
jc42.c
jz4740-hwmon.c
k8temp.c
k10temp.c
Kconfig
lineage-pem.c
lm63.c
lm70.c
lm73.c
lm75.c
lm75.h
lm77.c
lm78.c
lm80.c
lm83.c
lm85.c
lm87.c
lm90.c
lm92.c
lm93.c
lm95241.c
lm95245.c
ltc4151.c
ltc4215.c
ltc4245.c
ltc4261.c
Makefile
max1111.c
max1619.c
max1668.c
max6639.c
max6642.c
max6650.c
max16065.c
mc13783-adc.c
ntc_thermistor.c
pc87360.c
pc87427.c
pcf8591.c
s3c-hwmon.c
sch56xx-common.c
sch56xx-common.h
sch5627.c
sch5636.c
sht15.c
sht21.c
sis5595.c
smm665.c
smsc47b397.c
smsc47m1.c
smsc47m192.c
thmc50.c
tmp102.c
tmp401.c
tmp421.c
twl4030-madc-hwmon.c
ultra45_env.c
via686a.c
via-cputemp.c
vt1211.c
vt8231.c
w83l785ts.c
w83l786ng.c
w83627ehf.c
w83627hf.c
w83781d.c
w83791d.c
w83792d.c
w83793.c
w83795.c
wm831x-hwmon.c
wm8350-hwmon.c