Samuel Ortiz 938e05bf13 regulator: Fix an s5m8767 build failure ... Due to a merge conflict we are getting this: drivers/regulator/s5m8767.c: In function ‘s5m8767_pmic_probe’: drivers/regulator/s5m8767.c:575:2: error: implicit declaration of function ‘s5m_reg_write’ [-Werror=implicit-function-declaration] This is fixed by fully converting this driver to the new s5m API. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>		2012-07-31 00:51:09 +02:00
..
accessibility
acpi	Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86	2012-07-30 11:54:53 -07:00
amba	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
ata	[libata] pata_cmd64x: whitespace cleanup	2012-07-25 16:07:40 -04:00
atm
auxdisplay
base	Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-07-30 10:11:31 -07:00
bcma	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2012-07-27 11:15:03 -04:00
block	virtio-blk: allow toggling host cache between writeback and writethrough	2012-07-30 13:30:52 +09:30
bluetooth
cdrom
char	Virtio patches, mainly hotplugging fixes.	2012-07-30 13:24:37 -07:00
clk	The common clk framework changes for 3.6 include a small number of core	2012-07-24 16:40:57 -07:00
clocksource	arm-soc: new SoC support	2012-07-23 16:31:31 -07:00
connector
cpufreq	ARM: arm-soc soc updates, take 2	2012-07-30 09:45:53 -07:00
cpuidle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-07-26 14:28:55 -07:00
crypto	ARM: SoC fixes	2012-07-26 20:29:52 -07:00
dca
devfreq
dio
dma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-07-24 17:12:54 -07:00
edac	Merge branch 'devel'	2012-07-29 21:11:05 -03:00
eisa
extcon	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
firewire	- Small fixes and optimizations.	2012-07-30 09:32:39 -07:00
firmware
gpio	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
gpu	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-07-30 10:06:23 -07:00
hid	Merge branch 'next' into for-linus	2012-07-24 22:43:04 -07:00
hsi
hv
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2012-07-30 10:10:26 -07:00
hwspinlock
i2c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
ide
idle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-07-26 14:28:55 -07:00
ieee802154
iio
infiniband	InfiniBand/RDMA changes for the 3.6 merge window:	2012-07-24 13:56:26 -07:00
input	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
iommu	IOMMU Updates for Linux v3.6-rc1	2012-07-24 16:24:11 -07:00
isdn
leds	leds-lp8788: forgotten unlock at lp8788_led_work	2012-07-27 08:16:07 +08:00
lguest
macintosh
md	dm thin: commit before gathering status	2012-07-27 15:08:16 +01:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-07-24 13:34:56 -07:00
memory
memstick
message
mfd	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
misc	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
mmc	ARM: SoC fixes	2012-07-26 20:29:52 -07:00
mtd	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
net	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
nfc
nubus
of	Devicetree updates for 3.6	2012-07-24 14:07:22 -07:00
oprofile
parisc	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
parport
pci	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
pcmcia	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
pinctrl	Pin control changes for v3.6:	2012-07-24 14:05:46 -07:00
platform	Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86	2012-07-30 11:54:53 -07:00
pnp
power	Driver core merge for 3.6-rc1	2012-07-26 11:25:33 -07:00
pps
ps3
ptp
pwm	pwm: pwm-tiehrpwm: PWM driver support for EHRPWM	2012-07-26 07:45:20 +02:00
rapidio
regulator	regulator: Fix an s5m8767 build failure	2012-07-31 00:51:09 +02:00
remoteproc	A batch of remoteproc patches for 3.6:	2012-07-26 16:19:08 -07:00
rpmsg	A batch of remoteproc patches for 3.6:	2012-07-26 16:19:08 -07:00
rtc	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-26 18:09:01 -07:00
sbus
scsi	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
sfi
sh
sn
spi	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
ssb
staging	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
target	iscsi-target: Drop bogus struct file usage for iSCSI/SCTP	2012-07-21 02:44:13 -07:00
tc
thermal	Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release	2012-07-26 00:03:58 -04:00
tty	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
uio
usb	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
uwb
vhost	vhost: make vhost work queue visible	2012-07-22 01:22:23 +03:00
video	Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm	2012-07-30 09:22:37 -07:00
virt
virtio
vlynq
vme
w1	Driver core merge for 3.6-rc1	2012-07-26 11:25:33 -07:00
watchdog	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
xen	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
zorro
Kconfig
Makefile