linux-next: manual merge of the arm-soc tree with the usb tree

[Arnd Bergmann]

On Tuesday 27 November 2012, Stephen Rothwell wrote:
> @@@ -167,7 -184,9 +170,9 @@@ ehci_orion_conf_mbus_windows(struct usb
>         }
>   }
>   
> + static u64 ehci_orion_dma_mask = DMA_BIT_MASK(32);
> + 
>  -static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
>  +static int ehci_orion_drv_probe(struct platform_device *pdev)
>   {
>         struct orion_ehci_data *pd = pdev->dev.platform_data;
>         const struct mbus_dram_target_info *dram;

Looks good, thanks!

	Arnd