From: David S. Miller <davem@davemloft.net>
Date: Sun, 27 Jul 2008 12:00:25 +0000 (-0700)
Subject: Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=2ab61b01110aa04cd853c619a74881e3225a5e24;p=linux-edison.git

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

2ab61b01110aa04cd853c619a74881e3225a5e24