Ingo Molnar f407a82586 Merge branch 'linus' into sched/core, to resolve conflict ...

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2015-06-02 08:05:42 +02:00

..

bitfield.h

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

ef10_regs.h

sfc: Remove unused definitions of EF10 user-mode DMA descriptors

2014-02-12 17:53:34 -05:00

ef10.c

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

efx.c

sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask()

2015-05-27 15:22:15 +02:00

efx.h

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

enum.h

sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)

2014-04-16 14:33:57 -04:00

ethtool.c

ethtool: Support for configurable RSS hash function

2014-12-08 21:07:10 -05:00

falcon_boards.c

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

falcon.c

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

farch_regs.h

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

farch.c

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

filter.h

sfc: Use ether_addr_copy and eth_broadcast_addr

2014-03-10 13:53:37 -04:00

io.h

sfc: PIO:Restrict to 64bit arch and use 64-bit writes.

2014-06-11 15:36:21 -07:00

Kconfig

sfc: Minimal support for 40G link speed

2013-09-05 22:32:57 +01:00

Makefile

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

mcdi_mon.c

sfc: Add new sensor names

2013-12-12 22:06:54 +00:00

mcdi_pcol.h

ethernet: codespell comment spelling fixes

2015-03-08 22:54:22 -04:00

mcdi_port.c

sfc: Add 40G link capability decoding

2014-07-14 19:11:48 -07:00

mcdi.c

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

mcdi.h

sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)

2014-04-16 14:33:57 -04:00

mdio_10g.c

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

mdio_10g.h

sfc: Remove extern from function prototypes

2013-09-24 12:52:53 -07:00

mtd.c

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

net_driver.h

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

nic.c

sfc: fix calling of free_irq with already free vector

2014-05-12 14:56:45 -04:00

nic.h

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

phy.h

sfc: Remove extern from function prototypes

2013-09-24 12:52:53 -07:00

ptp.c

ptp: sfc: convert to the 64 bit get/set time methods.

2015-03-31 12:01:18 -04:00

qt202x_phy.c

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

rx.c

sfc: free multiple Rx buffers when required

2015-05-31 17:36:20 -07:00

selftest.c

sfc: Fix memcpy() with const destination compiler warning.

2015-04-17 15:15:40 -04:00

selftest.h

sfc: Add MC BISTs to ethtool offline self test on EF10

2013-12-12 22:05:48 +00:00

siena_sriov.c

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

siena.c

sfc: Revert SRIOV changes.

2015-04-08 16:30:01 -04:00

tenxpress.c

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

tx.c

sfc: remove incorrect EFX_BUG_ON_PARANOID check

2014-10-22 12:51:16 -04:00

txc43128_phy.c

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

vfdi.h

ethernet: codespell comment spelling fixes

2015-03-08 22:54:22 -04:00

workarounds.h

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00