From c22cea221f8de78ab36ce0f183b73c99031cc7dc Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Fri, 22 Oct 2010 12:24:02 -0400
Subject: start following git head again

---
 config-x86-generic | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'config-x86-generic')

diff --git a/config-x86-generic b/config-x86-generic
index ba3993563..616fae957 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -507,3 +507,8 @@ CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_IDEAPAD_ACPI=m
 CONFIG_INTEL_IPS=m
 
+CONFIG_OLPC_XO1=m
+
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_X86_RESERVE_LOW=64
-- 
cgit