kernel_optimize_test/drivers
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
accessibility
acpi ACPICA: Tables: Fix FADT dependency regression 2015-10-14 22:48:13 +02:00
amba
android
ata
atm atm: iphase: fix misleading indention 2015-10-12 19:56:27 -07:00
auxdisplay
base Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
bcma
block rbd: use writefull op for object size writes 2015-10-16 16:49:01 +02:00
bluetooth Bluetooth: bpa10x: Use h4_recv_buf helper for frame reassembly 2015-10-08 10:04:27 +03:00
bus
cdrom
char
clk Partially revert "clk: mvebu: Convert to clk_hw based provider APIs" 2015-10-14 11:28:17 -07:00
clocksource
connector
cpufreq cpufreq: intel_pstate: Fix divide by zero on Knights Landing (KNL) 2015-10-15 22:46:33 +02:00
cpuidle
crypto
dca
devfreq
dio
dma
dma-buf
edac
eisa
extcon
firewire
firmware
fmc
gpio
gpu drm/virtio: use %llu format string form atomic64_t 2015-10-16 11:36:36 +10:00
hid
hsi
hv
hwmon
hwspinlock
hwtracing/coresight
i2c i2c: designware: Do not use parameters from ACPI on Dell Inspiron 7348 2015-10-18 14:11:08 +02:00
ide
idle
iio
infiniband Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2015-10-16 17:39:27 -07:00
iommu IOMMU Fixes for Linux v4.3-rc5 2015-10-13 10:09:59 -07:00
ipack
irqchip Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
isdn mISDN: use kstrdup() in dsp_pipeline_build 2015-10-13 18:29:50 -07:00
leds
lguest
macintosh
mailbox
mcb
md dm thin: fix missing pool reference count decrement in pool_ctr error path 2015-10-13 12:20:55 -04:00
media
memory
memstick
message
mfd
misc powerpc fixes for 4.3 #3 2015-10-16 12:07:43 -07:00
mmc mmc: sdhci-of-at91: use SDHCI_QUIRK2_NEED_DELAY_AFTER_INT_CLK_RST quirk 2015-10-08 19:55:05 +02:00
mtd A few MTD fixes: 2015-10-07 09:35:15 +01:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
nfc
ntb
nubus
nvdimm
nvmem
of
oprofile
parisc
parport
pci genirq/msi: Do not use pci_msi_[un]mask_irq as default methods 2015-10-16 12:40:43 +02:00
pcmcia
perf
phy
pinctrl
platform
pnp
power
powercap
pps
ps3
ptp
pwm
rapidio
ras
regulator Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus 2015-10-06 12:00:42 +01:00
remoteproc
reset
rpmsg
rtc
s390 s390/qdio: fix WARN_ON_ONCE condition 2015-10-07 04:52:06 -07:00
sbus
scsi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
sfi
sh
sn
soc
spi Merge remote-tracking branches 'spi/fix/davinci' and 'spi/fix/sh-msiof' into spi-linus 2015-10-07 11:43:39 +01:00
spmi
ssb
staging mm, fs: obey gfp_mapping for add_to_page_cache() 2015-10-16 11:42:28 -07:00
target
tc
thermal
thunderbolt
tty Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
uio
usb
uwb
vfio
vhost
video video: of: fix memory leak 2015-10-07 14:13:59 +03:00
virt
virtio
vlynq
vme
w1
watchdog
xen
zorro
Kconfig
Makefile