From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 7 Jan 2006 18:44:22 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.16-rc1~930
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc918c7ab7da017bfaf9661420bb5c462e057cfb;p=linux-2.6

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

cc918c7ab7da017bfaf9661420bb5c462e057cfb