From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 17 Sep 2008 20:07:19 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=linux-2.6

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

6acf64e4fce43572d83fd2327cdbb85d0ea0c488