From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 7 Nov 2005 00:57:34 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.15-rc1~717
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=085f20e481190cd0597d72ec49bffc07bda4c9be;p=linux-2.6

Merge master.kernel.org:/home/rmk/linux-2.6-serial
---

085f20e481190cd0597d72ec49bffc07bda4c9be