David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
accessibility
acpi	ACPI / power: Avoid maybe-uninitialized warning	2017-04-19 22:46:10 +02:00
amba
android
ata	sata_via: Enable hotplug only on VT6421	2017-04-11 09:12:18 +09:00
atm
auxdisplay
base
bcma
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
bluetooth	bluetooth: hci_uart: add LL protocol serdev driver support	2017-04-13 19:22:53 +02:00
bus
cdrom
char	Fixes /dev/mem to read back zeros for System RAM areas in the 1MB exception	2017-04-14 08:57:20 -07:00
clk	Allwinner clock fixes for 4.11	2017-04-17 11:04:12 -07:00
clocksource	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-04-02 09:22:03 -07:00
connector
cpufreq	cpufreq: Bring CPUs up even if cpufreq_online() failed	2017-04-13 03:38:44 +02:00
cpuidle	cpuidle: powernv: Pass correct drv->cpumask for registration	2017-03-29 22:55:36 +02:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2017-04-10 09:37:43 -07:00
dax	device-dax: switch to srcu, fix rcu_read_lock() vs pte allocation	2017-04-12 13:45:18 -07:00
dca
devfreq
dio
dma
dma-buf
edac
eisa
extcon
firewire
firmware	efi/libstub: Skip GOP with PIXEL_BLT_ONLY format	2017-04-05 09:20:18 +02:00
fmc
fpga
fsi
gpio	ACPI / gpio: do not fall back to parsing _CRS when we get a deferral	2017-03-30 11:08:46 +02:00
gpu	Merge branch 'linux-4.11' of git://github.com/skeggsb/linux into drm-fixes	2017-04-13 09:56:05 +10:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2017-04-20 12:26:10 -07:00
hsi
hv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-06 08:24:51 -07:00
hwmon
hwspinlock
hwtracing
i2c
ide
idle
iio	iio: hid-sensor-attributes: Fix sensor property setting failure.	2017-04-02 11:44:03 +01:00
infiniband	hw/mlx5: Add New bit to check over QP creation	2017-04-17 11:08:32 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2017-04-21 09:13:43 -07:00
iommu
ipack
irqchip	irqchip/irq-imx-gpcv2: Fix spinlock initialization	2017-04-14 10:55:05 +02:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-06 08:24:51 -07:00
leds
lguest
lightnvm
macintosh
mailbox
mcb
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2017-04-08 11:56:58 -07:00
media
memory
memstick
message
mfd
misc
mmc	mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card	2017-04-20 14:41:05 +02:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
nfc	nfc: fix get_unaligned_...() misuses	2017-04-17 00:42:22 +02:00
ntb
nubus
nvdimm	libnvdimm: band aid btt vs clear poison locking	2017-04-10 17:21:45 -07:00
nvme	nvme: Quirk APST off on "THNSF5256GPUK TOSHIBA"	2017-04-20 14:42:10 -06:00
nvmem
of
oprofile
parisc
parport
pci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
pcmcia
perf
phy
pinctrl	pinctrl: cherryview: Add a quirk to make Acer Chromebook keyboard work again	2017-04-11 10:09:39 +02:00
platform
pnp
power
powercap
pps
ps3
ptp
pwm	pwm: rockchip: State of PWM clock should synchronize with PWM enabled state	2017-04-06 15:08:52 +02:00
rapidio	drivers/rapidio/devices/tsi721.c: make module parameter variable name unique	2017-03-31 17:13:30 -07:00
ras
regulator
remoteproc	soc: qcom: smd: Remove standalone driver	2017-03-28 17:58:07 -07:00
reset	reset: add exported __reset_control_get, return NULL if optional	2017-04-04 17:36:10 +02:00
rpmsg	soc: qcom: smd: Remove standalone driver	2017-03-28 17:58:07 -07:00
rtc
s390	s390/qeth: remove unimplemented gdev routines	2017-04-11 14:51:35 -04:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-20 10:35:33 -04:00
sfi
sh
sn
soc	soc: qcom: smd-rpm: Add msm8996 compatibility	2017-03-28 17:58:08 -07:00
spi
spmi
ssb
staging	My last pull request has been a while, we now have:	2017-04-20 13:54:40 -04:00
target	tcmu: Skip Data-Out blocks before gathering Data-In buffer for BIDI case	2017-04-02 16:18:51 -07:00
tc
thermal
thunderbolt
tty	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-20 10:35:33 -04:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
uwb
vfio
vhost
video	backlight: pwm_bl: Fix GPIO out for unimplemented .get_direction()	2017-04-19 19:59:44 +01:00
virt
virtio	virtio-pci: Remove affinity hint before freeing the interrupt	2017-04-11 00:30:20 +03:00
vlynq
vme
w1
watchdog
xen	xenbus: remove transaction holder from list before freeing	2017-04-04 10:11:06 -04:00
zorro
Kconfig
Makefile