From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@kernel.org (Kevin Hilman) Date: Wed, 10 Jun 2015 15:38:57 -0700 Subject: [PATCH 0/2] ARM: socfpga: Add CPU_METHOD_OF_DECLARE for SoCFPGA In-Reply-To: <1433297642-3818-1-git-send-email-dinh.linux@gmail.com> (dinh linux's message of "Tue, 2 Jun 2015 21:14:00 -0500") References: <1433297642-3818-1-git-send-email-dinh.linux@gmail.com> Message-ID: <7h8ubrkx32.fsf@deeprootsystems.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org dinh.linux at gmail.com writes: > From: Dinh Nguyen > > Hi Arnd, Kevin, Olof: > > Please apply these 2 patches for v4.2. I could not do a pull request for > these as they will cause a merge conflict for arm-soc/next. Applied to socfpga/soc and merged into for-next without any conflicts. For future reference, you could've added these to your previous branch (socfpga_updates_for_v4.2) and sent an additional pull request. Kevin