From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Fri, 28 Nov 2008 04:23:52 +0000 (+1100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=b5a20aa2657063cbf3b47fc700603180de4bb554;p=linux-edison.git

Merge git://git./linux/kernel/git/torvalds/linux-2.6
---

b5a20aa2657063cbf3b47fc700603180de4bb554