From: James Morris <james.l.morris@oracle.com>
Date: Sun, 10 Jun 2012 12:48:36 +0000 (+1000)
Subject: Merge branches 'next-queue' and 'next' into next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f52c44cd27b4a0be37ef97f0466e4095ebebef3f;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'next-queue' and 'next' into next

Pull in changes submitted during upstream merge window.
---