From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 14:57:17 +0000 (-0700)
Subject: Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.12~72
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35d1bc90546d1f0af198886ae8062a550142d926;p=linux-2.6

Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm
---

35d1bc90546d1f0af198886ae8062a550142d926