From: Simon Horman <horms@verge.net.au>
Date: Wed, 27 Aug 2008 05:29:46 +0000 (+1000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.28-rc1~717^2~282^2~1
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=09bf825e8e3049db1d72d464d0a6b857cc037a43;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'master' of git://git./linux/kernel/git/davem/net-2.6
---

09bf825e8e3049db1d72d464d0a6b857cc037a43