David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
boot	* Avoid garbage names in efivarfs due to buggy firmware by zero'ing	2015-05-06 08:30:24 +02:00
configs	x86/build/defconfig: Enable USB_EHCI_TT_NEWSCHED=y	2015-02-19 02:21:14 +01:00
crypto	crypto: x86/sha512_ssse3 - fixup for asm function prototype change	2015-04-24 20:09:01 +08:00
ia32	x86_64, asm: Work around AMD SYSRET SS descriptor attribute issue	2015-04-26 17:57:38 -07:00
include	tools/power turbostat: enable turbostat to support Knights Landing (KNL)	2015-05-27 18:03:57 -04:00
kernel	x86/fpu: Disable XSAVES* support for now	2015-05-20 11:58:26 +02:00
kvm	kvm/fpu: Enable eager restore kvm FPU for MPX	2015-05-20 12:30:26 +02:00
lguest	Some virtio internal cleanups, a new virtio device "virtio input", and	2015-04-22 10:55:06 -07:00
lib	x86: fix special __probe_kernel_write() tail zeroing case	2015-04-24 06:58:27 -07:00
math-emu	…
mm	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
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
oprofile	x86/asm/entry: Change all 'user_mode_vm()' calls to 'user_mode()'	2015-03-23 11:14:17 +01:00
pci	PCI / ACPI: Do not set ACPI companions for host bridges with parents	2015-05-28 01:39:53 +02:00
platform	TTY/Serial patches for 4.1-rc1	2015-04-21 09:33:10 -07:00
power	x86/asm/entry: Rename 'init_tss' to 'cpu_tss'	2015-03-06 08:32:58 +01:00
purgatory	Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-12-10 12:35:46 -08:00
realmode	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-02-16 14:58:12 -08:00
syscalls	xen: features and fixes for 4.1-rc0	2015-04-16 14:01:03 -05:00
tools	x86, build: replace Perl script with Shell script	2015-01-26 13:37:18 -08:00
um	Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc	2015-04-15 13:53:55 -07:00
vdso	x86/vdso: Fix 'make bzImage' on older distros	2015-05-11 10:25:02 +02:00
video	…
xen	hypervisor/x86/xen: Unset X86_BUG_SYSRET_SS_ATTRS on Xen PV guests	2015-05-05 18:27:43 +01:00
.gitignore	x86/build: Add arch/x86/purgatory/ make generated files to gitignore	2014-10-09 09:29:46 +02:00
Kbuild	kexec: create a new config option CONFIG_KEXEC_FILE for new syscall	2014-08-29 16:28:16 -07:00
Kconfig	Initial ACPI support for arm64:	2015-04-24 08:23:45 -07:00
Kconfig.cpu	…
Kconfig.debug	x86, intel-mid: remove Intel MID specific serial support	2015-03-07 03:25:18 +01:00
Makefile	kbuild: use relative path more to include Makefile	2015-04-02 16:42:08 +02:00
Makefile.um	kbuild: use relative path more to include Makefile	2015-04-02 16:42:08 +02:00
Makefile_32.cpu	…