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

[Olof Johansson]

Hi,

On Wed, Jan 11, 2012 at 6:50 AM, Arnd Bergmann <arnd at arndb.de> wrote:
> I'll drop the remaining atmel patches from my next/drivers2 branch and let
> Nicolas send me a new rebased pull request for 3.4. The patches in question
> look simple enough, but if the developers can't get a simple dependency right
> after discussing it for weeks, I'd rather not take it this time.

Sounds good to me.


-Olof