黄涛 19b3e31e91 Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb ... Conflicts: drivers/mmc/core/core.c drivers/net/wireless/bcm4319/dhd_sdio.c drivers/net/wireless/bcm4319/include/linux_osl.h drivers/net/wireless/bcm4319/wl_iw.c drivers/net/wireless/bcmdhd/dhd.h drivers/net/wireless/bcmdhd/dhd_cfg80211.c drivers/net/wireless/bcmdhd/dhd_linux.c drivers/net/wireless/bcmdhd/include/wlioctl.h drivers/net/wireless/bcmdhd/wl_cfg80211.c drivers/net/wireless/bcmdhd/wldev_common.c drivers/net/wireless/bcmdhd/wldev_common.h		2012-08-21 15:53:18 +08:00
..
boot	x86, setup: When probing memory with e801, use ax/bx as a pair	2011-04-25 14:52:37 -07:00
configs	cgroup: remove the ns_cgroup	2011-05-26 17:12:34 -07:00
crypto	crypto: aesni-intel - fix unaligned cbc decrypt for x86-32	2012-06-17 11:23:10 -07:00
ia32	ns: Wire up the setns system call	2011-05-28 10:48:39 -07:00
include/asm	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb	2012-08-21 13:11:48 +08:00
kernel	Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb	2012-08-21 15:53:18 +08:00
kvm	KVM: x86: fix missing checks in syscall emulation	2012-04-02 09:27:13 -07:00
lguest	lguest: fix timer interrupt setup	2011-05-30 11:14:10 +09:30
lib	x86: Derandom delay_tsc for 64 bit	2012-03-19 08:57:43 -07:00
math-emu	x86, fpu: Unbreak FPU emulation	2010-05-10 13:37:16 -07:00
mm	ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64)	2012-01-25 17:24:57 -08:00
net	x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND	2012-04-13 08:14:05 -07:00
oprofile	oprofile, x86: Fix crash when unloading module (nmi timer mode)	2011-12-09 08:52:44 -08:00
pci	x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version	2012-04-13 08:14:08 -07:00
platform	x86/UV2: Fix BAU destination timeout initialization	2012-01-25 17:25:01 -08:00
power	x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states	2010-08-20 14:59:02 +02:00
tools
vdso	x86-32, vdso: On system call restart after SYSENTER, use int $0x80	2011-08-29 13:29:14 -07:00
video
xen	xen/setup: filter APERFMPERF cpuid feature out	2012-06-22 11:34:13 -07:00
.gitignore	add random binaries to .gitignore	2010-04-08 11:34:34 +02:00
Kbuild	net: filter: Just In Time compiler for x86-64	2011-04-27 23:05:08 -07:00
Kconfig	x86: Disable AMD_NUMA for 32bit for now	2011-07-11 16:25:30 +02:00
Kconfig.cpu	x86, cpu: Move AMD Elan Kconfig under "Processor family"	2011-04-08 13:01:25 -07:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-21 13:06:00 -07:00
Makefile_32.cpu	x86, cpu: Move AMD Elan Kconfig under "Processor family"	2011-04-08 13:01:25 -07:00