From: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Tue, 24 Jan 2006 20:34:47 +0000 (-0600)
Subject: Merge with /home/shaggy/git/linus-clean/
X-Git-Tag: v2.6.17-rc1~1185^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a0fc0ddbe732779366ab6b1b879f62195e65967;p=linux-2.6

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

0a0fc0ddbe732779366ab6b1b879f62195e65967