David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
boot	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-27 16:17:42 -08:00
configs	x86: Default to ARCH=x86 to avoid overriding CONFIG_64BIT	2012-12-20 14:37:18 -08:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2013-02-25 15:56:15 -08:00
ia32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2013-03-02 08:34:06 -08:00
include	ACPI and power management fixes for 3.9-rc5	2013-03-28 13:47:31 -07:00
kernel	Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-03-24 10:10:34 -07:00
kvm	KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797)	2013-03-19 14:17:35 -03:00
lguest	Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-21 18:06:55 -08:00
lib	x86-64: Fix the failure case in copy_user_handle_tail()	2013-03-18 11:32:03 -07:00
math-emu
mm	x86: Do not try to sync identity map for non-mapped pages	2013-03-07 13:23:28 -08:00
net	filter: bpf_jit_comp: refactor and unify BPF JIT image dump output	2013-03-21 17:25:56 -04:00
oprofile
pci	Bug-fixes:	2013-03-03 14:22:53 -08:00
platform	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-27 16:17:42 -08:00
power	perf,x86: fix kernel crash with PEBS/BTS after suspend/resume	2013-03-15 09:26:35 -07:00
realmode	Merge remote-tracking branch 'origin/x86/mm' into x86/mm2	2013-02-01 02:28:36 -08:00
syscalls	fix compat truncate/ftruncate	2013-02-25 09:24:55 -05:00
tools	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-05 07:57:09 +11:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2013-02-23 18:50:11 -08:00
vdso	timers/x86/hpet: Use HPET_COUNTER to specify the hpet counter in vread_hpet()	2013-02-15 12:13:18 +01:00
video
xen	xen/mmu: Move the setting of pvops.write_cr3 to later phase in bootup.	2013-03-27 12:06:03 -04:00
.gitignore
Kbuild
Kconfig	Select VIRT_TO_BUS directly where needed	2013-03-12 11:16:40 -07:00
Kconfig.cpu	x86, 386 removal: Document Nx586 as a 386 and thus unsupported	2012-11-29 13:28:39 -08:00
Kconfig.debug
Makefile	Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-19 19:12:03 -08:00
Makefile.um
Makefile_32.cpu	x86, 386 removal: Remove CONFIG_M386 from Kconfig	2012-11-29 13:23:01 -08:00