From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 6 May 2005 22:41:11 +0000 (-0700)
Subject: Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
X-Git-Tag: v2.6.12-rc4~20
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=d4a1a7322c8c6b9899851f8358eb3842c67de6bc;hp=-c

Merge ... /home/rmk/linux-2.6-serial.git
---

d4a1a7322c8c6b9899851f8358eb3842c67de6bc