You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		10 years ago
..
accessibility	…
acpi	Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'	10 years ago
amba	…
android	…
ata	Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	10 years ago
atm	…
auxdisplay	…
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
bcma	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	10 years ago
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
bluetooth	Bluetooth: btusb: off by one in rtl8723b_parse_firmware()	10 years ago
bus	drivers: CCI: fix used_mask init in validate_group()	10 years ago
cdrom	…
char	ipmi: Fix multi-part message handling	10 years ago
clk	ARM: SoC multiplatform code changes for v4.1	10 years ago
clocksource	Initial ACPI support for arm64:	10 years ago
connector	…
cpufreq	cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning	10 years ago
cpuidle	cpuidle: Run tick_broadcast_exit() with disabled interrupts	10 years ago
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	10 years ago
dca	…
devfreq	…
dio	…
dma	dmaengine: increment privatecnt when using dma_get_any_slave_channel	10 years ago
dma-buf	dma-buf: cleanup dma_buf_export() to make it easily extensible	10 years ago
edac	…
eisa	…
extcon	Char/Misc driver patches for 4.1-rc1	10 years ago
firewire	…
firmware	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	10 years ago
fmc	…
gpio	gpio: omap: Fix regression for MPUIO interrupts	10 years ago
gpu	Merge tag 'drm-intel-fixes-2015-05-08' of git://anongit.freedesktop.org/drm-intel into drm-fixes	10 years ago
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	10 years ago
hsi	HSI: cmt_speech: fix error return code	10 years ago
hv	Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case	10 years ago
hwmon	hwmon: (w83795) use find_closest_descending() in pwm_freq_to_reg()	10 years ago
hwspinlock	…
hwtracing/coresight	Char/Misc driver patches for 4.1-rc1	10 years ago
i2c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	10 years ago
ide	Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	10 years ago
idle	Power management and ACPI updates for v4.1-rc1	10 years ago
iio	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	10 years ago
infiniband	infiniband: Remove duplicated KERN_<LEVEL> from pr_<level> uses	10 years ago
input	platform/chrome: Updates for v4.1	10 years ago
iommu	iommu/arm-smmu: Fix sign-extension of upstream bus addresses at stage 1	10 years ago
ipack	…
irqchip	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	10 years ago
isdn	net: Pass kern from net_proto_family.create to sk_alloc	10 years ago
leds	This is the bulk of GPIO changes for the v4.1 development	10 years ago
lguest	Some virtio internal cleanups, a new virtio device "virtio input", and	10 years ago
macintosh	Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next	10 years ago
mailbox	…
mcb	mcb: request_mem_region() returns NULL on error	10 years ago
md	A few fixes for md.	10 years ago
media	media fixes for v4.1-rc3	10 years ago
memory	ARM: SoC driver updates for v4.1	10 years ago
memstick	memstick: mspro_block: add missing curly braces	10 years ago
message	…
mfd	can: janz-ican3: add support for CAL/CANopen firmware	10 years ago
misc	Char/Misc driver patches for 4.1-rc1	10 years ago
mmc	mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE	10 years ago
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
nfc	NFC: logging neatening	10 years ago
ntb	…
nubus	…
of	Devicetree updates for 4.1:	10 years ago
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
parisc	parisc: Eliminate sg_virt_addr() and private scatterlist.h	10 years ago
parport	…
pci	xen: features and fixes for 4.1-rc0	10 years ago
pcmcia	ARM: SoC cleanups for v4.1	10 years ago
phy	USB patches for 4.1-rc1	10 years ago
pinctrl	These are some GPIO fixes for the v4.1 series:	10 years ago
platform	thinkpad_acpi: Fix warning for static not at beginning	10 years ago
pnp	Power management and ACPI updates for v4.1-rc1	10 years ago
power	power: bq27x00_battery: Add missing MODULE_ALIAS	10 years ago
powercap	powercap / RAPL: Add support for Intel Skylake processors	10 years ago
pps	…
ps3	…
ptp	…
pwm	pwm: Remove __init initializer for pwm_add_table()	10 years ago
rapidio	…
ras	…
regulator	== Changes to existing drivers ==	10 years ago
remoteproc	…
reset	…
rpmsg	…
rtc	rtc: armada38x: fix concurrency access in armada38x_rtc_set_time	10 years ago
s390	s390/3215: free memory in error path	10 years ago
sbus	drivers/sbus/char/envctrl.c: ignore orderly_poweroff return value	10 years ago
scsi	3w-9xxx: fix command completion race	10 years ago
sfi	…
sh	drivers: sh: Remove test for now unsupported sh7372	10 years ago
sn	…
soc	- fix unused variable warning for pmic-wrapper	10 years ago
spi	Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix/fsl-espi' into spi-linus	10 years ago
spmi	spmi: pmic_arb: remove ARM build time dependency	10 years ago
ssb	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	10 years ago
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	10 years ago
tc	…
thermal	drivers: thermal: st: remove several sparse warnings	10 years ago
thunderbolt	…
tty	xen: bug fixes for 4.1-rc2	10 years ago
uio	Revert "uio: constify of_device_id array"	10 years ago
usb	cdc-acm: prevent infinite loop when parsing CDC headers.	10 years ago
uwb	…
vfio	vfio: Fix runaway interruptible timeout	10 years ago
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	10 years ago
video	fbdev changes for v4.1	10 years ago
virt	…
virtio	virtio: drop virtio_device_is_legacy_only	10 years ago
vlynq	…
vme	…
w1	…
watchdog	Merge git://www.linux-watchdog.org/linux-watchdog	10 years ago
xen	xen: Add __GFP_DMA flag when xen_swiotlb_init gets free pages on ARM	10 years ago
zorro	…
Kconfig	…
Makefile	coresight: moving to new "hwtracing" directory	10 years ago