linux-next: manual merge of the crypto tree with the omap tree

2010-09-26 Thread Stephen Rothwell
Hi Herbert, Today's linux-next merge of the crypto tree got a conflict in arch/arm/mach-omap2/devices.c between commit 5d14f2792f9d63c5d25903bd048017c4b53c7d9a (omap: crypto: updates to enable omap aes) from the omap tree and commit b744c679f62b368cb94c21c1dcd4618e42d88d63 (crypto: updates to

Re: linux-next: manual merge of the crypto tree with the omap tree

2010-09-26 Thread Herbert Xu
On Mon, Sep 27, 2010 at 02:33:00PM +1000, Stephen Rothwell wrote: Hi Herbert, Today's linux-next merge of the crypto tree got a conflict in arch/arm/mach-omap2/devices.c between commit 5d14f2792f9d63c5d25903bd048017c4b53c7d9a (omap: crypto: updates to enable omap aes) from the omap tree and