Linus Walleij
9d93efe35e
gpio: tps65912: fix bad merge
...
I screwed up while merging the immutable branch for TPS65912,
so fixing it unbroken again.
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Andrew F. Davis <afd@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2016-03-09 22:02:52 +07:00
arch
Merge branch 'ib-mfd-regulator-gpio-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
2016-03-09 17:40:37 +07:00
block
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2016-01-29 12:56:08 -08:00
certs
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-01-22 11:58:43 -08:00
Documentation
Merge branch 'ib-mfd-regulator-gpio-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
2016-03-09 17:40:37 +07:00
drivers
gpio: tps65912: fix bad merge
2016-03-09 22:02:52 +07:00
firmware
WHENCE: use https://linuxtv.org for LinuxTV URLs
2015-12-04 10:35:11 -02:00
fs
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-01-31 15:49:06 -08:00
include
Revert "gpio: lp3943: Drop pin_used and lp3943_gpio_request/lp3943_gpio_free"
2016-03-09 22:00:27 +07:00
init
mm: memcontrol: rein in the CONFIG space madness
2016-01-20 17:09:18 -08:00
ipc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-01-23 12:24:56 -08:00
kernel
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-01-31 15:49:06 -08:00
lib
debugobjects: Allow bigger number of early boot objects
2016-01-27 15:40:59 +01:00
mm
Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm
2016-01-29 15:13:48 -08:00
net
Rework and error handling fixes, primarily in the fscatch and fd transports.
2016-01-24 12:39:09 -08:00
samples
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-11-17 13:52:59 -08:00
scripts
powerpc fixes for 4.5
2016-01-29 16:10:16 -08:00
security
KEYS: Only apply KEY_FLAG_KEEP to a key if a parent keyring has it set
2016-01-28 10:48:40 +11:00
sound
ALSA: hda - disable dynamic clock gating on Broxton before reset
2016-01-29 14:00:41 +01:00
tools
Merge branch 'ib-mfd-regulator-gpio-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
2016-03-09 17:40:37 +07:00
usr
virt
kvm: rename pfn_t to kvm_pfn_t
2016-01-15 17:56:32 -08:00
.get_maintainer.ignore
.gitignore
.mailmap
mailmap: redirect inactive address <ao2@amarulasolutions.com>
2016-01-27 10:50:04 -08:00
COPYING
CREDITS
./CREDITS: add credit information for Martin Kepplinger
2016-01-20 17:09:18 -08:00
Kbuild
Kconfig
MAINTAINERS
Merge branch 'chardev' into devel
2016-02-09 12:58:19 +01:00
Makefile
Linux 4.5-rc2
2016-01-31 18:12:16 -08:00
README
README.md
Share upstreaming patches
2016-02-23 19:33:35 +05:30
REPORTING-BUGS