Anton Vorontsov 76d8a23b12 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... The merge is merely to fix conflicts before sending a pull request. Conflicts: drivers/power/ab8500_btemp.c drivers/power/ab8500_charger.c drivers/power/ab8500_fg.c drivers/power/abx500_chargalg.c drivers/power/max8925_power.c Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>		2012-12-11 22:15:57 -08:00
..
abx500	mfd: remove use of __devexit	2012-11-28 12:22:27 -08:00
arizona	mfd: Initial support for the WM5110	2012-07-16 15:00:32 +02:00
da9052	MFD changes for 3.5	2012-05-29 11:53:11 -07:00
da9055	mfd: DA9055 core driver	2012-09-29 01:25:28 +02:00
pcf50633
pm8xxx	mfd: remove use of __devexit	2012-11-28 12:22:27 -08:00
samsung	mfd: Add s2mps11 irq driver	2012-07-16 14:31:59 +02:00
syscon	ARM: imx6q: Add iomuxc gpr support into syscon	2012-09-17 15:24:31 +02:00
wm831x	MFD changes for 3.5	2012-05-29 11:53:11 -07:00
wm8350	mfd: Remove custom wm8350 cache implementation	2012-07-09 00:16:10 +02:00
wm8994	ASoC: wm_hubs: Allow configuration of MICBIAS power up delay via pdata	2012-08-22 19:00:37 +01:00
88pm80x.h	mfd: remove use of __devinit	2012-11-28 12:20:19 -08:00
88pm860x.h	1. New drivers:	2012-10-07 17:29:24 +09:00
aat2870.h
ab3100.h	mfd: ab3100: Split ab3100 headers out of abx500.h	2012-09-14 09:52:15 +02:00
abx500.h	ab8500: Add devicetree support for chargalg	2012-11-18 19:37:18 -08:00
adp5520.h
asic3.h	MFD changes for 3.5	2012-05-29 11:53:11 -07:00
core.h	mfd: core: Push irqdomain mapping out into devices	2012-09-15 23:22:04 +02:00
da903x.h
davinci_voicecodec.h
db8500-prcmu.h	mfd: dbx500: Export prmcu_request_ape_opp_100_voltage	2012-10-29 11:05:12 -07:00
dbx500-prcmu.h	mfd: dbx500: Export prmcu_request_ape_opp_100_voltage	2012-10-29 11:05:12 -07:00
ds1wm.h
ezx-pcap.h	ARM: pxa: remove irq_to_gpio from ezx-pcap driver	2012-08-09 15:16:41 +02:00
htc-egpio.h
htc-pasic3.h
intel_msic.h
janz.h
lm3533.h	mfd: Add r_select to lm3533 platform data	2012-05-22 23:47:42 +02:00
lp8788-isink.h	mfd: Add lp8788 mfd driver	2012-09-23 20:51:34 +02:00
lp8788.h	lp8788-charger: Fix ADC channel names	2012-11-17 20:44:44 -08:00
lpc_ich.h	gpio: gpio-ich: Share ownership of GPIO groups	2012-09-14 09:52:13 +02:00
max8907.h	mfd: max8907: Add power off control	2012-09-19 12:07:56 +02:00
max8925.h	mfd: max8925: Remove array in regulator platform data	2012-09-19 12:39:13 +02:00
max8997-private.h	mfd: Add irq domain support for max8997 interrupts	2012-07-09 00:16:13 +02:00
max8997.h	mfd: Add irq domain support for max8997 interrupts	2012-07-09 00:16:13 +02:00
max8998-private.h
max8998.h	mfd: printk/comment fixes	2012-09-01 10:01:31 -07:00
max77686-private.h	mfd: Remove unused max77686 iolock mutex	2012-07-09 00:16:14 +02:00
max77686.h	regulator: max77686: initialize of_node param for regulator register	2012-08-28 11:00:25 -07:00
max77693-private.h	mfd: Remove unused max77693 iolock mutex	2012-07-09 00:16:07 +02:00
max77693.h	extcon: MAX77693: Add platform data for MUIC device to initialize registers	2012-10-23 16:32:16 +09:00
mc13xxx.h	mfd: mc13xxx: add codec platform data	2012-05-18 16:42:08 +01:00
mc13783.h
mc13892.h
mcp.h
palmas.h	mfd: palmas: Change regulator defns to better suite DT	2012-09-23 20:51:29 +02:00
rc5t583.h	rtc: rc5t583: add ricoh rc5t583 RTC driver	2012-10-06 03:05:03 +09:00
rdc321x.h
rtsx_common.h	drivers/mfd: Add realtek pcie card reader driver	2012-11-15 17:30:14 -08:00
rtsx_pci.h	drivers/mfd: Add realtek pcie card reader driver	2012-11-15 17:30:14 -08:00
smsc.h	mfd: smsc: Add support for smsc gpio io/keypad driver	2012-10-01 15:27:48 +02:00
sta2x11-mfd.h	mfd: Add driver for STA2X11 MFD block	2012-05-09 15:34:28 +02:00
stmpe.h	mfd: Allow for const stmpe keyboard data	2012-05-09 17:20:29 +02:00
syscon.h	mfd: Add syscon driver based on regmap	2012-09-17 15:24:14 +02:00
t7l66xb.h
tc3589x.h	mfd: Provide the tc3589x with its own IRQ domain	2012-09-17 15:03:38 +02:00
tc6387xb.h
tc6393xb.h
ti_ssp.h
tmio.h	mmc: tmio: support caps2 flags	2012-07-21 00:02:18 -04:00
tps6105x.h
tps6507x.h
tps6586x.h	MFD bits for the 3.7 merge window.	2012-10-05 12:01:30 +09:00
tps65090.h
tps65217.h	backlight: Add TPS65217 WLED driver	2012-09-25 10:42:02 +02:00
tps65910.h	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-06 03:09:16 +09:00
tps65912.h
twl4030-audio.h
twl6040.h	MFD bits for the 3.7 merge window.	2012-10-05 12:01:30 +09:00
ucb1x00.h
wl1273-core.h
wm8400-audio.h
wm8400-private.h	mfd: Remove wm8400 custom cache implementation	2012-05-20 17:27:01 +02:00
wm8400.h