From: Mark Brown Date: Wed, 1 Feb 2012 10:08:15 +0000 (+0000) Subject: Merge tag 'v3.3-rc2' into for-3.4 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=177f72fd101d512d938558b53cd4faa6a5434090;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'v3.3-rc2' into for-3.4 A reasonable amount of new development is causing fiddly merge conflicts between different resource management changes (mostly fixing bugs in resource management due to noticing things while doing enhancements in the same area). Linux 3.3-rc2 .. several days delayed. No reason, I just didn't think of it. --- 177f72fd101d512d938558b53cd4faa6a5434090