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
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
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
mfd: Use mfd cell platform_data for ab3100 cells platform bits
2011-05-26 19:44:58 +02:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
i2c: Remove obsolete cleanup for clientdata
2010-09-30 14:14:22 +02:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
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
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
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
regulator: Add export.h for THIS_MODULE to dummy.c
2011-10-31 19:32:15 -04:00
regulator: fix build when CONFIG_REGULATOR_DUMMY=n
2010-10-28 22:40:32 +01:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Add module.h include to gpio-regulator
2011-10-11 13:59:13 +01:00
regulator: missing index in PTR_ERR() in isl6271a_probe()
2011-01-12 14:33:06 +00:00
regulator: gpio-regulator add dependency on GENERIC_GPIO
2011-10-12 10:50:40 +01:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Add driver for gpio-controlled regulators
2011-10-09 12:36:21 +01:00
regulator: Report actual configured voltage to set_voltage()
2011-01-12 14:32:59 +00:00
regulator: Ensure enough enable time for max8649
2011-08-08 17:15:08 +01:00
regulator: Report actual configured voltage to set_voltage()
2011-01-12 14:32:59 +00:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: max8952: removed unused mutex.
2011-08-08 17:15:09 +01:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Fix memory leak in max8998_pmic_probe failure path
2011-05-27 10:49:09 +01:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
make mc13783 regulator code generic
2011-01-12 14:33:03 +00:00
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
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Fix typo in PCAP regulator_set_voltage()
2011-01-12 14:33:00 +00:00
regulator: Report actual configured voltage to set_voltage()
2011-01-12 14:32:59 +00:00
regulator: Add missing platform_set_drvdata in tps6105x_regulator_probe
2011-05-27 10:34:36 +01:00
regulator: tps6507x: Remove num_voltages array
2011-08-08 17:15:09 +01:00
regulator: fix tps6524x section mismatch
2011-03-26 14:15:06 +00:00
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
regulator: remove duplicate REG_CTRL2 defines in tps65023
2011-10-09 12:05:27 +01:00
regulator: tps65910: Fix array access out of bounds bug
2011-07-22 11:41:57 +01:00
regulator: tps65912: Remove unused define of TPS65912_MAX_REG_ID
2011-08-08 17:12:51 +01:00
regulator: TWL: Remove entry of RES_ID for 6030 macros
2011-07-22 11:30:05 +01:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Improve WM831x DVS VSEL selection algorithm
2011-07-28 10:20:49 +01:00
regulator: Convert WM831x regulators to genirq
2011-03-26 14:15:04 +00:00
regulator: Fix WM831x regulator ID lookups for multiple WM831xs
2011-07-28 10:20:48 +01:00
regulator: Convert WM835x to use get_voltage_sel()
2011-01-12 14:33:04 +00:00
regulator: Add module.h to drivers/regulator users as required
2011-10-31 19:32:15 -04:00
regulator: Add WM1811 support
2011-10-07 12:49:18 +01:00
32aaeffbd4