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

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

c5111f504d2a9b0d258d7c4752b4093523315989