From: Benjamin Herrenschmidt Date: Wed, 28 Aug 2013 01:17:32 +0000 (+1000) Subject: Merge branch 'merge' into next X-Git-Tag: firefly_0821_release~176^2~5411^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=10420921675582903ab256dc3094206ac0280f68;p=firefly-linux-kernel-4.4.55.git Merge branch 'merge' into next Merge recent fixes to lparcfg so subsequent patches can move the whole file to arch/powerpc/platforms/pseries --- 10420921675582903ab256dc3094206ac0280f68