From: Len Brown <len.brown@intel.com>
Date: Thu, 13 Mar 2008 05:59:52 +0000 (-0400)
Subject: Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
X-Git-Tag: v2.6.25-rc6~19^2~1
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=b4de123a0bc4a3f0c90899864d51299628729952

Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
---

b4de123a0bc4a3f0c90899864d51299628729952