From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Tue, 14 Mar 2006 04:36:52 +0000 (-0500)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.17-rc1~15^2~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=58a343f22e8ef987b90e34bbef7f1455e3bb5a15;p=linux-2.6-block.git

Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
---

58a343f22e8ef987b90e34bbef7f1455e3bb5a15