From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 24 Jun 2005 22:33:30 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.13-rc4~89^2~13^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b3e112bcc19abd8e9657dca34a87316786e096f3;p=users%2Fjedix%2Flinux-maple.git

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

b3e112bcc19abd8e9657dca34a87316786e096f3