Axel Lin e03088972f mfd: Fix mc13xxx-spi merge conflict ...

This patch fixes conflict between commit 8ae3559
"mfd: mc13xxx workaround SPI hardware bug on i.Mx"
and commit 10c7a5d "mfd: Use devm_* APIs for mc13xxx".

commit 8ae3559 changes regmap_init_spi to regmap_init.
So now we need to use devm_regmap_init rather than devm_regmap_init_spi.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

2012-07-09 00:16:13 +02:00

..

accessibility

…

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-06-30 11:11:58 -07:00

amba

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:22:27 -07:00

ata

Viresh has moved

2012-06-20 14:39:36 -07:00

atm

solos-pci: Fix DMA support

2012-05-24 16:22:53 -04:00

auxdisplay

…

base

PM / Sleep: Prevent waiting forever on asynchronous suspend after abort

2012-06-24 23:31:09 +02:00

bcma

bcma: fix null pointer in bcma_core_pci_irq_ctl

2012-06-08 13:47:07 -04:00

block

floppy: cancel any pending fd_timeouts before adding a new one

2012-07-03 15:51:22 -07:00

bluetooth

Bluetooth: btmrvl: Do not send vendor events to bluetooth stack

2012-06-19 00:19:11 -03:00

cdrom

…

char

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-06-18 12:20:36 -07:00

clk

clk: fix parent validation in __clk_set_parent()

2012-07-03 12:05:14 -07:00

clocksource

clocksource: sh_tmu: Use clockevents_config_and_register().

2012-06-11 17:10:16 +09:00

connector

…

cpufreq

…

cpuidle

…

crypto

Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:42:29 -07:00

dca

…

devfreq

Merge tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-05-23 14:07:06 -07:00

dio

…

dma

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

2012-06-20 22:12:52 -07:00

edac

edac: Do alignment logic properly in edac_align_ptr()

2012-06-11 12:43:16 -03:00

eisa

…

extcon

extcon: max8997: Add missing kfree for info->edev in max8997_muic_remove()

2012-06-18 16:30:42 -07:00

firewire

Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

2012-05-24 12:57:47 -07:00

firmware

…

gpio

gpio/samsung: fix the typo 'exynos5_xxx' instead of 'exonys5_xxx'

2012-06-03 21:21:01 -07:00

gpu

drm/i915: kick any firmware framebuffers before claiming the gtt

2012-07-03 11:18:48 +01:00

hid

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2012-06-26 11:23:41 -07:00

hsi

…

hv

Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-05-22 16:02:13 -07:00

hwmon

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-06-29 10:29:54 -07:00

hwspinlock

…

i2c

i2c: Add generic I2C multiplexer using pinctrl API

2012-06-04 16:49:43 +02:00

ide

drivers/ide/ide-cs.c: adjust suspicious bit operation

2012-06-12 15:51:41 -07:00

idle

…

ieee802154

drivers/ieee802154: IEEE 802.15.4 loopback driver

2012-05-16 15:17:08 -04:00

iio

iio: drop wrong reference from Kconfig

2012-06-14 17:28:46 -07:00

infiniband

Merge branches 'cma' and 'ocrdma' into for-linus

2012-06-24 04:59:59 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2012-07-06 09:50:39 -07:00

iommu

iommu/amd: Fix deadlock in ppr-handling error path

2012-06-04 12:47:44 +02:00

isdn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-05-24 11:54:29 -07:00

leds

leds: heartbeat: fix bug on panic

2012-07-04 15:55:19 +08:00

lguest

…

macintosh

…

md

Merge tag 'md-3.5-fixes' of git://neil.brown.name/md

2012-07-03 18:05:35 -07:00

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-06-25 14:53:09 -07:00

memory

…

memstick

…

message

Merge branch 'akpm' (Andrew's patch-bomb)

2012-05-31 18:10:18 -07:00

mfd

mfd: Fix mc13xxx-spi merge conflict

2012-07-09 00:16:13 +02:00

misc

misc: mei: set WDIOF_ALARMONLY on mei watchdog

2012-06-13 15:34:31 -07:00

mmc

Revert "mmc: omap_hsmmc: Enable Auto CMD12"

2012-06-26 16:10:30 -04:00

mtd

Merge tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd

2012-07-06 10:34:48 -07:00

net

e1000e: remove use of IP payload checksum

2012-07-01 00:25:32 -07:00

nfc

NFC: potential integer overflow problem in check_crc()

2012-05-25 11:16:16 -04:00

nubus

…

of

of: match by compatible property first

2012-06-14 20:29:40 -05:00

oprofile

oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array

2012-06-21 16:15:11 +02:00

parisc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-05-22 19:22:50 -07:00

parport

Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-05-22 16:02:13 -07:00

pci

USB: add NO_D3_DURING_SLEEP flag and revert 151b612847

2012-06-13 13:11:39 -07:00

pcmcia

…

pinctrl

Merge branch 'akpm' (Andrew's patch-bomb)

2012-06-20 14:41:57 -07:00

platform

drivers/platform/x86/acerhdf.c: correct Boris' mail address

2012-06-07 14:43:55 -07:00

pnp

…

power

Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6

2012-05-31 12:10:15 -07:00

pps

…

ps3

…

ptp

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-05-22 19:22:50 -07:00

rapidio

rapidio/tsi721: add DMA engine support

2012-05-31 17:49:31 -07:00

regulator

mfd: Register db8500-prcmu devices using the newly DT:ed MFD API

2012-07-09 00:16:09 +02:00

remoteproc

remoteproc/omap: fix dev_err typo

2012-06-17 10:31:03 +03:00

rpmsg

…

rtc

mfd: Transfer rtc max8925 irq from MFD defined resources

2012-07-09 00:16:10 +02:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2012-05-31 10:51:10 -07:00

sbus

…

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2012-07-06 13:59:50 -07:00

sfi

…

sh

sh: intc: Kill off special reservation interface.

2012-05-22 19:07:55 +09:00

sn

…

spi

SPI: fix over-eager devm_xxx() conversion

2012-06-18 11:27:04 +01:00

ssb

ssb: add PCI IDs 0x4322 and 43222

2012-05-16 12:46:37 -04:00

staging

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-06-25 14:53:09 -07:00

target

tcm_fc: Resolve suspicious RCU usage warnings

2012-07-06 12:52:09 -07:00

tc

…

thermal

…

tty

Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2012-06-20 15:13:13 -07:00

uio

…

usb

mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix issues.

2012-07-09 00:16:12 +02:00

uwb

…

vhost

vhost: use USER_DS in vhost_worker thread

2012-06-26 21:10:56 -07:00

video

Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

2012-06-16 16:59:05 -07:00

virt

…

virtio

virtio-mmio: Devices parameter parsing

2012-05-22 12:16:15 +09:30

vlynq

…

vme

…

w1

Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:42:29 -07:00

watchdog

watchdog: core: fix WDIOC_GETSTATUS return value

2012-06-28 20:40:56 +02:00

xen

Merge tag 'stable/for-linus-3.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2012-06-15 17:17:15 -07:00

zorro

…

Kconfig

Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2012-05-22 16:34:21 -07:00

Makefile

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:22:27 -07:00