From: Jody McIntyre <scjody@modernduck.com>
Date: Fri, 16 Dec 2005 22:10:35 +0000 (-0500)
Subject: Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.15-rc6~1^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=16e842a62a8ffcc2e51def6ef9fd6e0926539bc5;p=linux-2.6-omap-h63xx.git

Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
---

16e842a62a8ffcc2e51def6ef9fd6e0926539bc5