From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 10 Oct 2005 17:39:26 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-ucb
X-Git-Tag: v2.6.14-rc4~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f96c3bbe91117402f13119ce9e609db9087ed58f;p=linux-2.6

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

f96c3bbe91117402f13119ce9e609db9087ed58f