From: David S. Miller <davem@davemloft.net>
Date: Fri, 18 Apr 2008 06:56:30 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1e42198609d73ed1a9adcba2af275c24c2678420;p=linux.git

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

1e42198609d73ed1a9adcba2af275c24c2678420