Re: [GIT PULL] new files form asm-generic

From: Arnd Bergmann
Date: Fri Jun 12 2009 - 04:40:46 EST


On Thursday 11 June 2009, Arnd Bergmann wrote:
> This is a series of patches that adds a mostly-complete set of generic
> header files in the include/asm-generic hierarchy.
>
> Please pull
> git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/asm-generic.git for-linus
>

The tree did not merge cleanly as of yesterday because of a conflict with
the perfcounters changes. I pulled the latest linux-2.6.git master
to resolve the conflict.

Arnd <><
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/