From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:11:28 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch iff-running
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=140fedb5f2efd1f23b26afb2d812004556ba9515;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge ... /spare/repo/netdev-2.6 branch iff-running
---

140fedb5f2efd1f23b26afb2d812004556ba9515