From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 20 Aug 2010 21:49:37 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=5519ec120d6617640dc2812a2cf05154422878ad;p=linux-edison.git

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

5519ec120d6617640dc2812a2cf05154422878ad