From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 28 Nov 2005 23:03:28 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.15-rc3~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d240918e6813b5c050eeff0c06480ee29e66df9;p=linux-2.6

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

5d240918e6813b5c050eeff0c06480ee29e66df9