OpenCloudOS-Kernel/drivers
Stephen Rothwell 4b703b1d4c power: axp288_charger: fix for API change
Caused by commit 843735b788 ("power: axp288_charger: axp288 charger
driver") from the battery tree interacting with commit 046050f6e6
("extcon: Update the prototype of extcon_register_notifier() with enum
extcon") from the extcon tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-06-26 17:44:09 -07:00
..
accessibility
acpi Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 2015-06-25 17:51:55 -07:00
amba
android
ata ARM: SoC cleanups for v4.2 2015-06-26 11:08:27 -07:00
atm atm: idt77105: Use setup_timer 2015-06-10 22:46:34 -07:00
auxdisplay
base Driver core patches for 4.2-rc1 2015-06-26 15:07:37 -07:00
bcma
block Char/Misc driver patches for 4.2-rc1 2015-06-26 14:51:15 -07:00
bluetooth Bluetooth: ath3k: Add support of 04ca:300d AR3012 device 2015-06-18 21:00:06 +03:00
bus ARM: SoC: driver updates for v4.2 2015-06-26 11:54:29 -07:00
cdrom
char Char/Misc driver patches for 4.2-rc1 2015-06-26 14:51:15 -07:00
clk ARM: SoC: driver updates for v4.2 2015-06-26 11:54:29 -07:00
clocksource Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 2015-06-26 12:20:00 -07:00
connector
cpufreq Power management and ACPI material for v4.2-rc1 2015-06-23 14:18:07 -07:00
cpuidle Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 2015-06-26 12:20:00 -07:00
crypto Power management and ACPI material for v4.2-rc1 2015-06-23 14:18:07 -07:00
dca
devfreq
dio
dma TTY/Serial driver patches for 4.2-rc1 2015-06-26 15:53:22 -07:00
dma-buf
edac Driver core patches for 4.2-rc1 2015-06-26 15:07:37 -07:00
eisa
extcon extcon: Redefine the unique id of supported external connectors without 'enum extcon' type 2015-06-12 17:01:42 -07:00
firewire
firmware ARM: SoC: driver updates for v4.2 2015-06-26 11:54:29 -07:00
fmc
gpio Here is the bulk of pin control changes for the v4.2 series: 2015-06-24 19:21:02 -07:00
gpu Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2015-06-26 13:18:51 -07:00
hid Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus 2015-06-22 16:23:43 +02:00
hsi HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction 2015-06-23 02:40:03 +02:00
hv Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion 2015-06-12 16:58:33 -07:00
hwmon Char/Misc driver patches for 4.2-rc1 2015-06-26 14:51:15 -07:00
hwspinlock
hwtracing/coresight
i2c Char/Misc driver patches for 4.2-rc1 2015-06-26 14:51:15 -07:00
ide Merge branch 'for-4.2/core' of git://git.kernel.dk/linux-block 2015-06-25 14:29:53 -07:00
idle
iio Third round of new IIO drivers, cleanups and functionality for the 4.2 cycle. 2015-06-10 20:48:34 -07:00
infiniband Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-06-24 16:49:49 -07:00
input TTY/Serial driver patches for 4.2-rc1 2015-06-26 15:53:22 -07:00
iommu Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2015-06-26 13:18:51 -07:00
ipack
irqchip Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 2015-06-26 12:20:00 -07:00
isdn Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-06-24 16:49:49 -07:00
leds ARM: SoC: driver updates for v4.2 2015-06-26 11:54:29 -07:00
lguest Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2015-06-22 17:59:09 -07:00
macintosh macintosh/nvram: Remove as unused 2015-06-15 16:42:37 +10:00
mailbox mailbox/bcm2835: Fix mailbox full detection. 2015-06-13 16:20:39 +05:30
mcb
md - Revert block and DM core changes the removed request-based DM's 2015-06-26 12:35:01 -07:00
media Staging driver patches for 4.2-rc1 2015-06-26 15:46:08 -07:00
memory ARM: SoC: driver updates for v4.2 2015-06-26 11:54:29 -07:00
memstick
message fusion: remove dead MTRR code 2015-06-13 08:44:14 -07:00
mfd RTC for 4.2 2015-06-25 18:55:33 -07:00
misc Char/Misc driver patches for 4.2-rc1 2015-06-26 14:51:15 -07:00
mmc Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block 2015-06-25 15:22:36 -07:00
mtd Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block 2015-06-25 16:00:17 -07:00
net netconsole: implement extended console support 2015-06-25 17:00:39 -07:00
nfc Char/Misc driver patches for 4.2-rc1 2015-06-26 14:51:15 -07:00
ntb PCI changes for the v4.2 merge window: 2015-06-23 13:41:24 -07:00
nubus
of Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2015-06-26 13:18:51 -07:00
oprofile
parisc
parport parport: check exclusive access before register 2015-06-12 16:58:33 -07:00
pci Mohit Kumar has moved 2015-06-25 17:00:38 -07:00
pcmcia Char/Misc driver patches for 4.2-rc1 2015-06-26 14:51:15 -07:00
phy USB patches for 4.2-rc1 2015-06-26 15:59:26 -07:00
pinctrl ARM: SoC: driver updates for v4.2 2015-06-26 11:54:29 -07:00
platform Staging driver patches for 4.2-rc1 2015-06-26 15:46:08 -07:00
pnp Merge branches 'pnp' and 'pm-tools' 2015-06-19 01:18:43 +02:00
power power: axp288_charger: fix for API change 2015-06-26 17:44:09 -07:00
powercap
pps
ps3
ptp
pwm pwm: Changes for v4.2-rc1 2015-06-23 13:32:38 -07:00
rapidio Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2015-06-23 14:08:54 -07:00
ras
regulator sound updates for 4.2-rc1 2015-06-25 17:15:18 -07:00
remoteproc
reset
rpmsg
rtc RTC for 4.2 2015-06-25 18:55:33 -07:00
s390 Merge branch 'for-4.2/drivers' of git://git.kernel.dk/linux-block 2015-06-25 15:12:50 -07:00
sbus
scsi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-06-24 16:49:49 -07:00
sfi
sh
sn
soc ARM: SoC: driver updates for v4.2 2015-06-26 11:54:29 -07:00
spi Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next 2015-06-18 00:19:56 +01:00
spmi
ssb
staging Staging driver patches for 4.2-rc1 2015-06-26 15:46:08 -07:00
target Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-06-24 16:49:49 -07:00
tc
thermal Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 2015-06-25 17:51:55 -07:00
thunderbolt
tty TTY/Serial driver patches for 4.2-rc1 2015-06-26 15:53:22 -07:00
uio uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config 2015-06-12 17:01:43 -07:00
usb USB patches for 4.2-rc1 2015-06-26 15:59:26 -07:00
uwb
vfio powerpc updates for 4.2 2015-06-24 08:46:32 -07:00
vhost Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-06-24 16:49:49 -07:00
video TTY/Serial driver patches for 4.2-rc1 2015-06-26 15:53:22 -07:00
virt
virtio PCI changes for the v4.2 merge window: 2015-06-23 13:41:24 -07:00
vlynq
vme vme: tsi148: depend on HAS_DMA for Kconfig 2015-06-12 17:31:05 -07:00
w1 w1: use correct lock on error in w1_seq_show() 2015-06-12 16:58:33 -07:00
watchdog ARM: SoC: platform support for v4.2 2015-06-26 11:34:35 -07:00
xen frontswap: allow multiple backends 2015-06-24 17:49:45 -07:00
zorro
Kconfig
Makefile