From 7e9a20960cf52b8e6d5f9c08f432d8cc11e435fc Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon, 15 Nov 2010 15:26:07 +0000
Subject: [PATCH] Merge remote branch 'elliot/c90-fix'