From: David S. Miller <davem@davemloft.net>
Date: Thu, 8 Jan 2009 19:05:59 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=7f46b1343f723f98634a5dcee47856b2000079ed;p=linux-edison.git

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

7f46b1343f723f98634a5dcee47856b2000079ed