From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 8 Aug 2010 23:49:58 +0000 (+0200)
Subject: Merge commit 'linus/master' into bkl/core
X-Git-Tag: v2.6.36-rc1~297^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1;p=pandora-kernel.git

Merge commit 'linus/master' into bkl/core

Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
---

d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1
Reading git-diff-tree failed