kernel-fxtec-pro1x/drivers/base
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
power PM / Domains: Fix validation of latency constraints in genpd governor 2015-10-14 02:34:43 +02:00
regmap Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
attribute_container.c
base.h driver core: correct device's shutdown order 2015-08-05 17:07:19 -07:00
bus.c driver-core: add asynchronous probing support for drivers 2015-05-20 00:25:24 -07:00
cacheinfo.c cpu/cacheinfo: Fix teardown path 2015-09-17 06:06:54 -07:00
class.c drivers: base: class: Add a blank line after declarations 2015-03-25 14:36:19 +01:00
component.c
container.c
core.c Power management and ACPI material for v4.3-rc1 2015-09-01 19:45:46 -07:00
cpu.c cpu: Remove bogus __ref annotation of cpu_subsys_online() 2015-08-05 15:18:26 -07:00
dd.c Power management and ACPI material for v4.3-rc1 2015-09-01 19:45:46 -07:00
devcoredump.c
devres.c devres: fix devres_get() 2015-08-05 15:11:48 -07:00
devtmpfs.c VFS: assorted weird filesystems: d_inode() annotations 2015-04-15 15:06:58 -04:00
dma-coherent.c
dma-contiguous.c
dma-mapping.c drivers: base: dma-mapping: Erase blank space after pointer 2015-03-25 14:36:19 +01:00
driver.c driver core: add missing blank line after declaration 2015-03-25 14:36:30 +01:00
firmware.c
firmware_class.c firmware: fix wrong memory deallocation in fw_add_devm_name() 2015-08-05 15:18:26 -07:00
hypervisor.c
init.c drivers: of/base: move of_init to driver_init 2015-05-26 19:55:56 -07:00
isa.c
Kconfig
Makefile drivers/base: Add MSI domain support for non-PCI devices 2015-07-30 00:14:38 +02:00
map.c
memory.c mm, hotplug: fix concurrent memory hot-add deadlock 2015-04-14 16:49:00 -07:00
module.c
node.c mm: check if section present during memory block registering 2015-09-04 16:54:41 -07:00
pinctrl.c
platform-msi.c platform-msi: Do not cache msi_desc in handler_data 2015-09-15 17:06:29 +02:00
platform.c drivercore: Fix unregistration path of platform devices 2015-08-25 11:29:57 -05:00
property.c device property: Don't overwrite addr when failing in device_get_mac_address 2015-09-08 13:40:23 -07:00
soc.c drivers/base: use tabs where possible in code indentation 2015-03-25 14:37:35 +01:00
syscore.c
topology.c sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask() 2015-05-27 15:22:15 +02:00
transport_class.c