From: Greg Kroah-Hartman Date: Tue, 24 Dec 2013 17:43:21 +0000 (-0800) Subject: Merge 3.13-rc5 into staging-next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5bd2010fbe027b224db2e74a4fdfec9a7b7918d2;p=openwrt%2Fstaging%2Fblogic.git Merge 3.13-rc5 into staging-next We want these fixes here to handle some merge issues. Signed-off-by: Greg Kroah-Hartman --- 5bd2010fbe027b224db2e74a4fdfec9a7b7918d2