From: Jody McIntyre <scjody@modernduck.com>
Date: Mon, 28 Nov 2005 22:46:32 +0000 (-0500)
Subject: Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.16-rc1~474^2~39
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a880b11a95fab4618da412d99fc7365d723e702d;p=users%2Fjedix%2Flinux-maple.git

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

a880b11a95fab4618da412d99fc7365d723e702d