Linus Torvalds fa8f53ace4 Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, olpc-xo15-sci: Enable EC wakeup capability x86, olpc: Fix dependency on POWER_SUPPLY x86, olpc: Add XO-1.5 SCI driver x86, olpc: Add XO-1 RTC driver x86, olpc-xo1-sci: Propagate power supply/battery events x86, olpc-xo1-sci: Add lid switch functionality x86, olpc-xo1-sci: Add GPE handler and ebook switch functionality x86, olpc: EC SCI wakeup mask functionality x86, olpc: Add XO-1 SCI driver and power button control x86, olpc: Add XO-1 suspend/resume support x86, olpc: Rename olpc-xo1 to olpc-xo1-pm x86, olpc: Move CS5536-related constants to cs5535.h x86, olpc: Add missing elements to device tree		2011-07-26 11:11:54 -07:00
..
ce4100	x86: ce4100: Configure IOAPIC pins for USB and SATA to level type	2011-04-28 11:38:30 +02:00
efi	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 17:03:14 -07:00
iris	x86: platform: Move iris to x86/platform where it belongs	2010-11-20 10:37:05 +01:00
mrst	x86: Fix mrst sparse complaints	2011-05-07 10:52:30 +02:00
olpc	x86, olpc-xo15-sci: Enable EC wakeup capability	2011-07-24 20:16:05 +02:00
scx200
sfi	Merge branch 'linus' into x86/apic-cleanups	2011-01-07 14:14:15 +01:00
uv	x86, UV: Correct failed topology memory leak	2011-06-21 14:50:33 +02:00
visws	x86: visws: Fixup irq overhaul fallout	2011-04-04 16:51:15 +02:00
Makefile	x86: platform: Move iris to x86/platform where it belongs	2010-11-20 10:37:05 +01:00