From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 18:42:44 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.12~69
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5131bf5db73529e972459060d8559f72e036fe53;p=linux-2.6

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

5131bf5db73529e972459060d8559f72e036fe53