]> err.no Git - linux-2.6/commitdiff
Merge branches 'release' and 'ppc-workaround' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:12:17 +0000 (03:12 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:12:17 +0000 (03:12 -0500)

Trivial merge