From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 2 Nov 2005 05:32:46 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.15-rc1~18^2~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec33b309101bb2904e9fe20252f7760e254d05ec;p=linux-2.6

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

ec33b309101bb2904e9fe20252f7760e254d05ec