patches taken directly from the stable-queue git repository Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>