David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
accessibility
acpi	Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'	2015-05-07 21:24:34 +02:00
amba
android
ata	Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2015-05-11 10:54:20 -07:00
atm
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-26 17:22:07 -07:00
bcma
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
bluetooth	Bluetooth: btusb: off by one in rtl8723b_parse_firmware()	2015-04-30 01:05:30 +02:00
bus	drivers: CCI: fix used_mask init in validate_group()	2015-05-07 18:29:18 +02:00
cdrom
char	ipmi: Fix multi-part message handling	2015-05-05 19:37:22 -05:00
clk	ARM: SoC multiplatform code changes for v4.1	2015-04-22 09:20:15 -07:00
clocksource	Initial ACPI support for arm64:	2015-04-24 08:23:45 -07:00
connector
cpufreq
cpuidle	cpuidle: Run tick_broadcast_exit() with disabled interrupts	2015-04-29 15:19:21 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-04-26 13:51:05 -07:00
dca
devfreq
dio
dma	dmaengine: increment privatecnt when using dma_get_any_slave_channel	2015-04-29 16:47:57 +05:30
dma-buf	dma-buf: cleanup dma_buf_export() to make it easily extensible	2015-04-21 14:47:16 +05:30
edac
eisa
extcon	Char/Misc driver patches for 4.1-rc1	2015-04-21 09:42:58 -07:00
firewire
firmware	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-05-06 10:57:37 -07:00
fmc
gpio	gpio: omap: Fix regression for MPUIO interrupts	2015-05-06 15:19:38 +02:00
gpu	Merge tag 'drm-intel-fixes-2015-05-08' of git://anongit.freedesktop.org/drm-intel into drm-fixes	2015-05-11 06:06:22 +10:00
hid
hsi
hv
hwmon
hwspinlock
hwtracing/coresight	Char/Misc driver patches for 4.1-rc1	2015-04-21 09:42:58 -07:00
i2c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2015-04-26 17:44:09 -07:00
ide	Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2015-05-11 10:54:20 -07:00
idle
iio
infiniband	infiniband: Remove duplicated KERN_<LEVEL> from pr_<level> uses	2015-05-12 15:52:37 -04:00
input	platform/chrome: Updates for v4.1	2015-04-26 13:36:02 -07:00
iommu	iommu/arm-smmu: Fix sign-extension of upstream bus addresses at stage 1	2015-05-11 18:36:20 +02:00
ipack
irqchip	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-05-09 14:59:05 -07:00
isdn	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
leds
lguest	Some virtio internal cleanups, a new virtio device "virtio input", and	2015-04-22 10:55:06 -07:00
macintosh
mailbox
mcb
md	A few fixes for md.	2015-05-11 10:33:31 -07:00
media	media fixes for v4.1-rc3	2015-05-05 08:42:06 -07:00
memory	ARM: SoC driver updates for v4.1	2015-04-22 09:18:17 -07:00
memstick
message
mfd	can: janz-ican3: add support for CAL/CANopen firmware	2015-05-06 08:03:20 +02:00
misc	Char/Misc driver patches for 4.1-rc1	2015-04-21 09:42:58 -07:00
mmc	mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE	2015-05-08 08:55:47 +02:00
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-26 17:22:07 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
nfc
ntb
nubus
of	Devicetree updates for 4.1:	2015-04-24 08:46:18 -07:00
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-26 17:22:07 -07:00
parisc	parisc: Eliminate sg_virt_addr() and private scatterlist.h	2015-04-21 22:02:43 +02:00
parport
pci
pcmcia	ARM: SoC cleanups for v4.1	2015-04-22 09:04:39 -07:00
phy
pinctrl	These are some GPIO fixes for the v4.1 series:	2015-05-08 19:42:59 -07:00
platform	thinkpad_acpi: Fix warning for static not at beginning	2015-05-05 13:56:46 -07:00
pnp
power	power: bq27x00_battery: Add missing MODULE_ALIAS	2015-05-01 23:01:48 +02:00
powercap
pps
ps3
ptp
pwm	pwm: Remove __init initializer for pwm_add_table()	2015-04-23 14:50:52 +02:00
rapidio
ras
regulator
remoteproc
reset
rpmsg
rtc	rtc: armada38x: fix concurrency access in armada38x_rtc_set_time	2015-05-05 17:10:11 -07:00
s390	s390/3215: free memory in error path	2015-04-23 16:55:50 +02:00
sbus
scsi	3w-9xxx: fix command completion race	2015-04-27 10:10:19 -07:00
sfi
sh	drivers: sh: Remove test for now unsupported sh7372	2015-04-27 13:08:14 +09:00
sn
soc
spi	Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix/fsl-espi' into spi-linus	2015-05-11 17:29:49 +01:00
spmi
ssb
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-04-24 10:22:09 -07:00
tc
thermal
thunderbolt
tty	xen: bug fixes for 4.1-rc2	2015-05-06 15:58:06 -07:00
uio
usb	cdc-acm: prevent infinite loop when parsing CDC headers.	2015-04-28 12:53:16 +02:00
uwb
vfio	vfio: Fix runaway interruptible timeout	2015-05-01 16:31:41 -06:00
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-04-24 10:22:09 -07:00
video	fbdev changes for v4.1	2015-04-20 15:16:25 -07:00
virt
virtio
vlynq
vme
w1
watchdog	Merge git://www.linux-watchdog.org/linux-watchdog	2015-04-22 11:22:55 -07:00
xen	xen: Add __GFP_DMA flag when xen_swiotlb_init gets free pages on ARM	2015-05-06 15:02:58 +01:00
zorro
Kconfig
Makefile