Jacek Anaszewski 3be62b957d mfd: max77693: Adjust FLASH_EN_SHIFT and TORCH_EN_SHIFT macros ...

Modify FLASH_EN_SHIFT and TORCH_EN_SHIFT macros to work properly
when passed enum max77693_fled values (0 for FLED1 and 1 for FLED2)
from leds-max77693 driver. Previous definitions were compatible with
one of the previous RFC versions of leds-max77693.c driver, which was
not merged.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

2015-03-12 09:07:27 +00:00

..

acpi

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2015-02-19 11:28:36 -08:00

asm-generic

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-02-18 09:24:01 -08:00

clocksource

time: move the timecounter/cyclecounter code into its own file.

2014-12-30 18:29:25 -05:00

crypto

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

2015-02-14 09:47:01 -08:00

drm

drm/dp: add drm_dp_link_power_down() helper

2015-02-01 15:06:42 -05:00

dt-bindings

mfd: arizona: Move useful defines into a dt-binding include

2015-03-03 16:41:24 +00:00

keys

KEYS: Restore partial ID matching functionality for asymmetric keys

2014-10-06 15:21:05 +01:00

kvm

arm/arm64: KVM: allow userland to request a virtual GICv3

2015-01-20 18:25:33 +01:00

linux

mfd: max77693: Adjust FLASH_EN_SHIFT and TORCH_EN_SHIFT macros

2015-03-12 09:07:27 +00:00

math-emu

…

media

[media] tea575x: split and export functions

2015-01-27 10:13:50 -02:00

memory

…

misc

cxl: Add new header for call backs and structs

2014-10-08 20:15:43 +11:00

net

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

2015-02-17 17:41:19 -08:00

pcmcia

…

ras

PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND

2014-09-25 09:42:40 -06:00

rdma

Revert "IB/core: Add support for extended query device caps"

2015-02-06 00:54:33 -08:00

rxrpc

include/rxrpc/types.h: Remove unused header

2014-08-29 20:33:39 -07:00

scsi

Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block

2015-02-12 14:13:23 -08:00

soc

soc/tegra: Add Tegra132 support

2015-01-09 16:13:57 +01:00

sound

ALSA: pcm: allow for trigger_tstamp snapshot in .trigger

2015-02-09 16:01:53 +01:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-02-21 13:21:19 -08:00

trace

Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-02-17 16:12:34 -08:00

uapi

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-02-21 19:41:38 -08:00

video

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-02-16 15:48:00 -08:00

xen

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

2015-02-10 20:01:30 -08:00

Kbuild

…