From: Roland Dreier <rolandd@cisco.com>
Date: Fri, 28 Oct 2005 22:50:51 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.15-rc1~731^2~21^2~1
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=a4da0628efd788eb199dd9df225e296035ec2539;p=powerpc.git

Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
---

a4da0628efd788eb199dd9df225e296035ec2539