David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
accessibility
acpi	ACPI / LPSS: provide con_id for the clkdev	2015-03-10 00:28:43 +01:00
amba	ARM: 8256/1: driver coamba: add device binding path 'driver_override'	2015-02-10 10:23:15 +00:00
android	android: binder: fix binder mmap failures	2015-03-01 18:43:51 -08:00
ata	sata-fsl: Apply link speed limits	2015-03-02 12:08:43 -05:00
atm	drivers: atm: nicstar: remove ifdef'd out skb destructors	2015-03-10 13:34:53 -04:00
auxdisplay
base	regmap: Fixes for v4.0	2015-03-17 10:41:26 -07:00
bcma	bcma: prepare Kconfig symbol for PCI driver	2015-03-05 14:11:45 +02:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2015-02-28 10:21:57 -08:00
bluetooth	Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_CSR	2015-03-17 18:31:05 +02:00
bus	ARM: SoC platform changes	2015-02-17 09:27:54 -08:00
cdrom
char	Not entirely surprising: the ongoing QEMU work on virtio 1.0 has revealed	2015-03-17 10:36:01 -07:00
clk	The clk fixes for 4.0-rc4 comprise three themes. First are the usual	2015-03-15 15:07:08 -07:00
clocksource	clockevents: sun5i: Fix setup_irq init sequence	2015-03-05 15:01:37 +01:00
connector
coresight	coresight: fix function etm_writel_cp14() parameter order	2015-02-04 10:42:55 -08:00
cpufreq	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2015-03-06 13:43:33 -08:00
cpuidle	cpuidle / sleep: Use broadcast timer for states that stop local timer	2015-03-05 23:13:19 +01:00
crypto	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-02-18 08:49:20 -08:00
dca
devfreq	Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'	2015-02-13 21:39:06 +01:00
dio
dma	dmaengine: mmp_pdma: fix warning about slave caps	2015-03-05 22:15:35 +05:30
dma-buf
edac	* A fix to sb_edac for proper detection on SNB machines	2015-02-19 11:18:14 -08:00
eisa
extcon
firewire	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
firmware	* Fix regression in DMI sysfs code for handling "End of Table" entry	2015-03-02 14:18:57 +01:00
fmc
gpio	gpio: tps65912: fix wrong container_of arguments	2015-02-23 15:40:32 +01:00
gpu	[PATCH] drm/mm: Fix support 4 GiB and larger ranges	2015-03-16 06:28:50 +10:00
hid	HID: wacom: check for wacom->shared before following the pointer	2015-03-17 20:59:55 +01:00
hsi
hv	Char / Misc patches for 3.20-rc1	2015-02-15 10:48:44 -08:00
hwmon	hwmon: (ads7828) Check return value of devm_regmap_init_i2c	2015-02-22 20:10:30 -08:00
hwspinlock
i2c	Revert "i2c: core: Dispose OF IRQ mapping at client removal time"	2015-03-12 10:23:05 +01:00
ide	ide_tape: convert jiffies with jiffies_to_msecs	2015-03-18 23:25:57 -04:00
idle	intel_idle: Add ->enter_freeze callbacks	2015-02-15 19:40:09 +01:00
iio	Second round of IIO fixes for the 4.0 cycle (or round one part two really!)	2015-02-28 07:19:27 -08:00
infiniband	IB/mlx4: Saturate RoCE port PMA counters in case of overflow	2015-03-18 15:17:11 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-03-19 16:43:10 -07:00
iommu	iommu/io-pgtable-arm: Add built time dependency	2015-03-03 14:04:12 +01:00
ipack
irqchip	Merge branch 'irqchip/urgent-gic' into irqchip/urgent	2015-03-15 01:41:26 +00:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
leds	leds: leds-gpio: Pass on error codes unmodified	2015-02-02 14:36:10 -08:00
lguest	OK, this has the big virtio 1.0 implementation, as specified by OASIS.	2015-02-18 09:24:01 -08:00
macintosh
mailbox	Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration	2015-02-11 12:56:40 -08:00
mcb	mcb: Fix error path of mcb_pci_probe	2015-02-03 15:48:51 -08:00
md	md: mark some attributes as pre-alloc	2015-02-25 11:38:46 +11:00
media	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
memory	memory/fsl-corenet-cf: Add t1040 support	2015-01-29 22:57:43 -06:00
memstick
message	i2o: move to staging	2015-02-03 15:58:39 -08:00
mfd	Changes to existing drivers:	2015-02-18 09:05:48 -08:00
misc	mei: make device disabled on stop unconditionally	2015-03-01 19:34:50 -08:00
mmc	mmc: pwrseq_simple: fix error path in mmc_pwrseq_simple_alloc	2015-03-19 11:26:35 +01:00
mtd	mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA	2015-03-02 22:55:56 -08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
nfc	NFC: nci: Move NFCEE discovery logic	2015-02-04 09:15:18 +01:00
ntb
nubus
of	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
oprofile
parisc
parport
pci	PCI updates for v4.0:	2015-03-12 09:45:46 -07:00
pcmcia	ARM: SoC driver updates	2015-02-17 09:38:59 -08:00
phy	USB patches for 3.20-rc1	2015-02-15 10:24:55 -08:00
pinctrl	pinctrl: sun4i: GPIOs configured as irq must be set to input before reading	2015-03-18 10:56:46 +01:00
platform	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-02-21 11:12:07 -08:00
pnp	Merge branches 'pnp', 'pm-cpuidle' and 'pm-cpufreq'	2015-02-21 04:29:16 +01:00
power	power_supply: 88pm860x: Fix leaked power supply on probe fail	2015-01-28 15:08:10 +01:00
powercap
pps
ps3
ptp
pwm	pwm: tegra: Use NSEC_PER_SEC	2015-02-18 08:40:29 +01:00
rapidio	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-02-18 08:49:20 -08:00
ras
regulator	Merge remote-tracking branches 'regulator/fix/gpio-enable' and 'regulator/fix/tps65910' into regulator-linus	2015-03-16 11:43:24 +00:00
remoteproc
reset
rpmsg	virtio_rpmsg: set DRIVER_OK before using device	2015-03-13 15:55:42 +10:30
rtc	drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data	2015-03-12 18:46:07 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-09 23:38:02 -04:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
sfi
sh	drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd	2015-02-24 07:26:12 +09:00
sn
soc	ARM: SoC driver updates	2015-02-17 09:38:59 -08:00
spi	Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/dw', 'spi/fix/img-spfi', 'spi/fix/pl022' and 'spi/fix/ti-qspi' into spi-linus	2015-03-06 21:10:56 +00:00
spmi
ssb	ssb: Silence warning for unknown backplane revision	2015-03-03 15:49:40 +02:00
staging	staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel	2015-03-01 19:25:59 -08:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-02-21 13:21:19 -08:00
tc
thermal	thermal: Make sysfs attributes of cooling devices default attributes	2015-03-05 01:47:57 -04:00
thunderbolt
tty	TTY/Serial fixes for 4.0-rc3	2015-03-08 12:25:40 -07:00
uio
usb	Merge branch 'gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-03-13 10:55:32 -07:00
uwb	USB patches for 3.20-rc1	2015-02-15 10:24:55 -08:00
vfio	vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX	2015-03-12 09:51:38 -06:00
vhost	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
video	OMAPDSS: fix regression with display sysfs files	2015-02-26 10:23:15 +02:00
virt
virtio	virtio_mmio: fix access width for mmio	2015-03-17 12:12:21 +10:30
vlynq
vme
w1
watchdog	watchdog: at91sam9: request the irq with IRQF_NO_SUSPEND	2015-03-06 00:46:31 +01:00
xen	xen-pciback: limit guest control of command register	2015-03-11 14:34:40 +00:00
zorro
Kconfig	i2o: move to staging	2015-02-03 15:58:39 -08:00
Makefile