From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 29 Apr 2005 22:08:34 +0000 (-0700)
Subject: Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
X-Git-Tag: v2.6.12-rc4~136^2~195
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ad57fb4b5e9d68553f4440377b99f75588fa88;p=linux-2.6

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

a6ad57fb4b5e9d68553f4440377b99f75588fa88