From: Thomas Gleixner Date: Thu, 27 Aug 2009 14:42:07 +0000 (+0200) Subject: Merge branch 'x86/paravirt' into x86/cleanups X-Git-Tag: v2.6.32-rc1~629^2~39 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6effcd92454ca5d7021b74f89fcac75209e146f9;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'x86/paravirt' into x86/cleanups Reason: The setup cleanups conflict with the paravirt cleanups. Avoid a rather large merge conflict Signed-off-by: Thomas Gleixner --- 6effcd92454ca5d7021b74f89fcac75209e146f9