Linus Torvalds 61e5191c9d Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 ... Pull x86 platform driver updates from Matthew Garrett: "Some significant updates to samsung-laptop, additional hardware support for Toshibas, misc updates to various hardware and a new backlight driver for some Apple machines." Fix up trivial conflicts: geode Geos update happening next to net5501 support, and MSIC thermal platform support added twice. * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (77 commits) acer-wmi: add quirk table for video backlight vendor mode drivers/platform/x86/amilo-rfkill.c::amilo_rfkill_probe() avoid NULL deref samsung-laptop: unregister ACPI video module for some well known laptops acer-wmi: No wifi rfkill on Sony machines thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS asus-wmi: don't update power and brightness when using scalar eeepc-wmi: split et2012 specific hacks eeepc-wmi: refine quirks handling asus-nb-wmi: set panel_power correctly asus-wmi: move WAPF variable into quirks_entry asus-wmi: store backlight power status for AIO machine asus-wmi: add scalar board brightness adj. support samsung-laptop: cleanup return type: mode_t vs umode_t drivers, samsung-laptop: fix usage of isalnum drivers, samsung-laptop: fix initialization of sabi_data in sabi_set_commandb asus-wmi: on/off bit is not set when reading the value eeepc-wmi: add extra keymaps for EP121 asus-nb-wmi: ignore useless keys acer-wmi: support Lenovo ideapad S205 Brazos wifi switch acer-wmi: fix out of input parameter size when set ...		2012-03-28 14:20:23 -07:00
..
boot	x86, boot: Correct CFLAGS for hostprogs	2012-03-22 12:42:51 -07:00
configs	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-03-22 20:19:30 -07:00
ia32	Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:41:22 -07:00
include/asm	The following text was taken from the original review request:	2012-03-24 10:08:39 -07:00
kernel	The following text was taken from the original review request:	2012-03-24 10:08:39 -07:00
kvm	Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:41:22 -07:00
lguest	lguest: Make sure interrupt is allocated ok by lguest_setup_irq	2012-01-12 15:44:47 +10:30
lib	Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:23:57 -07:00
math-emu
mm	The following text was taken from the original review request:	2012-03-24 10:08:39 -07:00
net	net: bpf_jit: fix BPF_S_LDX_B_MSH compilation	2012-03-19 17:41:44 -04:00
oprofile	Merge branch 'core' of git://amd64.org/linux/rric into perf/core	2011-11-15 11:05:18 +01:00
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-03-23 14:02:12 -07:00
platform	Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86	2012-03-28 14:20:23 -07:00
power	i387: Split up <asm/i387.h> into exported and internal interfaces	2012-02-21 14:12:54 -08:00
syscalls	x86-32: Fix typo for mq_getsetattr in syscall table	2012-03-22 12:42:41 -07:00
tools	x86/tools: Add decoded instruction dump mode	2011-12-05 14:53:23 +01:00
um	Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-03-27 18:29:53 -07:00
vdso	coredump: remove VM_ALWAYSDUMP flag	2012-03-23 16:58:42 -07:00
video	x86: fix up files really needing to include module.h	2011-10-31 19:30:36 -04:00
xen	One tiny feature that accidentally got lost in the initial git pull:	2012-03-24 12:20:25 -07:00
.gitignore	x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore	2012-01-16 08:21:59 +01:00
Kbuild
Kconfig	Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86	2012-03-28 14:20:23 -07:00
Kconfig.cpu	x86: Tighten dependencies of CPU_SUP_*_32	2012-03-08 10:57:34 +01:00
Kconfig.debug	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-11 19:13:40 -08:00
Makefile	x86: Generate system call tables and unistd_*.h from tables	2011-11-17 13:35:37 -08:00
Makefile_32.cpu
Makefile.um	um: most of the SUBARCH uses can be killed	2012-03-25 00:29:56 +01:00