From: David S. Miller <davem@davemloft.net>
Date: Tue, 9 Sep 2008 12:09:24 +0000 (-0700)
Subject: Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
X-Git-Tag: v2.6.28-rc1~717^2~303
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ded67c0e2f0388458c36e8fd3b0c8be07c53db08;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
---

ded67c0e2f0388458c36e8fd3b0c8be07c53db08