From: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Fri, 11 Nov 2005 20:09:06 +0000 (-0600)
Subject: Merge with /home/shaggy/git/linus-clean/
X-Git-Tag: v2.6.17-rc1~1185^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca869912366f60cb5e0bdd09f65e80ee6816e73c;p=linux-2.6

Merge with /home/shaggy/git/linus-clean/
---

ca869912366f60cb5e0bdd09f65e80ee6816e73c