From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 29 Jan 2013 00:33:37 +0000 (+1100)
Subject: Merge branch 'merge' into next
X-Git-Tag: firefly_0821_release~3680^2~1053^2~45
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dfd0436ad0ce139467b124c646fa65ee2635e14a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'merge' into next

Merge "merge" branch to bring in various bug fixes that are
going into 3.8
---

dfd0436ad0ce139467b124c646fa65ee2635e14a