From: Anton Altaparmakov <aia21@hera.kernel.org>
Date: Fri, 9 Sep 2005 15:19:10 +0000 (-0700)
Subject: Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.14-rc1~492
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddcc95963449d028b16d9b9fe50f6e91ce7d9e81;p=linux-2.6

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

ddcc95963449d028b16d9b9fe50f6e91ce7d9e81