From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 31 Jan 2006 20:49:28 +0000 (-0200)
Subject: Merge branch 'origin'
X-Git-Tag: v2.6.16-rc3~135^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=638e174688f58200d0deb7435093435e7d737b09;p=pandora-kernel.git

Merge branch 'origin'
---

638e174688f58200d0deb7435093435e7d737b09
Reading git-diff-tree failed