linux-kernel - linux-next: manual merge of the dt-rh tree with the l2-mtd tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120706145131.2d590abbdd53af03f4913846@canb.auug.org.au>
Date:	Fri, 6 Jul 2012 14:51:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rob Herring <robherring2@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Josh Wu <josh.wu@...el.com>, Hong Xu <hong.xu@...el.com>,
	Artem Bityutskiy <dedekind1@...il.com>,
	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>
Subject: linux-next: manual merge of the dt-rh tree with the l2-mtd tree

Hi Rob,

Today's linux-next merge of the dt-rh tree got a conflict in
Documentation/devicetree/bindings/mtd/atmel-nand.txt between commit
348d200508b1 ("mtd: at91: add dt parameters for Atmel PMECC") from the
l2-mtd tree and commit e7e88f9f8aeb ("of: fix a few typos in the binding
documentation") from the dt-rh tree.

The former replaced the text (and fixed the typo) fixed by the latter, so
I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped