From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 23 Jun 2005 23:58:55 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.13-rc1~68^2~384
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f46f6b20cb01508f5020142ff91021f8fb39550b;p=linux-2.6

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

f46f6b20cb01508f5020142ff91021f8fb39550b