From a357644ac7eb3fd7177036a0dd9a3b2839184c00 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 31 Oct 2008 15:12:35 -0700
Subject: [PATCH] Manually merge patch 4b1135a277f4b38f60b9c9f28adae467feb07856

Looks like automerge hosed it somehow.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
Reading git-format-patch failed