From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 1 Nov 2010 18:37:23 +0000 (-0400)
Subject: Merge branch 'master' of ../mine
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e5837cef1d8356e8303585bd13611ecb3edb5747;p=linux.git

Merge branch 'master' of ../mine
---

e5837cef1d8356e8303585bd13611ecb3edb5747