From: David S. Miller <davem@sunset.davemloft.net>
Date: Fri, 26 Oct 2007 10:50:02 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
X-Git-Tag: v2.6.24-rc2~132^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8c56a347c1dfbe384b1ffb65d8828faa36dbaea4;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
---

8c56a347c1dfbe384b1ffb65d8828faa36dbaea4