From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 4 Dec 2009 02:27:36 +0000 (-0500)
Subject: Merge branch 'devel' into linux-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=7285f2d2ffd4b7ab4ffb70a47759ee209c30017b;p=linux-edison.git

Merge branch 'devel' into linux-next
---

7285f2d2ffd4b7ab4ffb70a47759ee209c30017b