From: R. Steve McKown <rsmckown@gmail.com>
Date: Fri, 7 May 2010 20:42:29 +0000 (-0600)
Subject: Merge TinyOS 2.1.1 into master.
X-Git-Tag: release/2.1.1-4.3~1
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=e9bfab607e051bae6afb47b44892ce37541d1b44;p=tinyos-2.x.git

Merge TinyOS 2.1.1 into master.

How this merge was done:
* Rebase patchset/2.1.0-4.2 onto tinyos/2.1.1 as topic/patchup211
* cp topic/patchup211 tree to tmp dir
* Checkout master, rm all files, cp in from tmp dir, git add .

Future work on TinyOS 2.1.0 w/TMI enhancements via release/2.1.0.
---