-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 11/26/2012 10:56 AM, Stephen Rothwell :
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/at91sam9g45.dtsi between various commits from
> the arm-soc and pincrtl trees and commit 7492e7ca0f95 ("ARM:
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/at91sam9g45.dtsi between various commits from the
arm-soc and pincrtl trees and commit 7492e7ca0f95 ("ARM: at91/dts: add
at91sam9_wdt driver to at91sam926x, at91sam9g45") from the arm-soc tree.
I fixed it up
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/at91sam9g45.dtsi between various commits from the
arm-soc and pincrtl trees and commit 7492e7ca0f95 (ARM: at91/dts: add
at91sam9_wdt driver to at91sam926x, at91sam9g45) from the arm-soc tree.
I fixed it up
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 11/26/2012 10:56 AM, Stephen Rothwell :
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/at91sam9g45.dtsi between various commits from
the arm-soc and pincrtl trees and commit 7492e7ca0f95 (ARM:
4 matches
Mail list logo