From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sun, 22 Aug 2010 03:10:59 +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=2c1179afc3bc92a2db930a085fee33214bd886e3;p=linux-edison.git

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

2c1179afc3bc92a2db930a085fee33214bd886e3