From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 29 Aug 2005 17:34:31 +0000 (-0700)
Subject: Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
X-Git-Tag: v2.6.14-rc1~1054
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2321fbd2b87539edc1fbfc2e186528a1ef93835f;p=linux-2.6

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

2321fbd2b87539edc1fbfc2e186528a1ef93835f