From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 24 Sep 2005 20:50:35 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-ucb
X-Git-Tag: v2.6.14-rc3~51^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1;p=linux-2.6

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

ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1