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

2009-11-20 Thread Dmitry Torokhov
On Wed, Nov 18, 2009 at 06:53:30PM -0800, Tony Lindgren wrote: Dmitry, could you please drop 5018461a887d58f4601207deeebb7c352c2da20a from your tree now? Done. -- Dmitry -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to

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

2009-11-20 Thread Tony Lindgren
* Dmitry Torokhov dmitry.torok...@gmail.com [091120 00:59]: On Wed, Nov 18, 2009 at 06:53:30PM -0800, Tony Lindgren wrote: Dmitry, could you please drop 5018461a887d58f4601207deeebb7c352c2da20a from your tree now? Done. Thanks! Tony -- To unsubscribe from this list: send the line

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

2009-11-18 Thread Stephen Rothwell
Hi Dmitry, Today's linux-next merge of the input tree got a conflict in arch/arm/mach-omap2/board-rx51-peripherals.c between commit ebff0472f451a07fae9f4e72bdc2af4c52ebb682 (omap3: rx51: Add wl1251 wlan driver support) from the omap tree and commit 5018461a887d58f4601207deeebb7c352c2da20a (ARM

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

2009-11-18 Thread Tony Lindgren
* Stephen Rothwell s...@canb.auug.org.au [091118 18:11]: Hi Dmitry, Today's linux-next merge of the input tree got a conflict in arch/arm/mach-omap2/board-rx51-peripherals.c between commit ebff0472f451a07fae9f4e72bdc2af4c52ebb682 (omap3: rx51: Add wl1251 wlan driver support) from the omap