From: Patrick McHardy <kaber@trash.net>
Date: Wed, 19 Jan 2011 22:51:37 +0000 (+0100)
Subject: Merge branch 'master' of /repos/git/net-next-2.6
X-Git-Tag: v2.6.39-rc1~468^2~512^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=14f0290ba44de6ed435fea24bba26e7868421c66

Merge branch 'master' of /repos/git/net-next-2.6
---

14f0290ba44de6ed435fea24bba26e7868421c66