From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Sat, 27 Aug 2005 12:30:07 +0000 (+0200)
Subject: Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=efda9452046bdd707b23a85b7846ec33548f84f1;p=linux-edison.git

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

efda9452046bdd707b23a85b7846ec33548f84f1