From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 31 Oct 2005 15:32:56 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
X-Git-Tag: v2.6.15-rc1~59^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fd5f8267dd37aaebadfabe71d9c808821eea05a;p=pandora-kernel.git

Merge kernel.org:/home/rmk/linux-2.6-drvmodel

Manual #include fixups for clashes - there may be some unnecessary
---

4fd5f8267dd37aaebadfabe71d9c808821eea05a
Reading git-diff-tree failed