]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'misc' and 'doc' into test
authorLen Brown <len.brown@intel.com>
Thu, 11 Aug 2011 19:39:38 +0000 (15:39 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 11 Aug 2011 19:39:38 +0000 (15:39 -0400)

Trivial merge