From: David S. Miller <davem@davemloft.net>
Date: Thu, 12 Jun 2008 00:53:04 +0000 (-0700)
Subject: Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6
X-Git-Tag: v2.6.26-rc7~40^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5cb960a80531211379f8f05c575725d7630098fe;p=linux-2.6-omap-h63xx.git

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

5cb960a80531211379f8f05c575725d7630098fe