Signed-off-by: Saul Wold <sgw@linux.intel.com>
from 2.6.34 Signed-off-by: Qing He <qing.he@intel.com>