Re: [GIT PULL 0/3] arm-soc: late changes for 3.9

[Olof Johansson]

On Thu, Feb 28, 2013 at 8:18 PM, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

>> I've pushed a resolved branch for reference (late-branches-resolved)
>> in case you want to compare conflict resolutions.
>
> So Arnd's tag talked about removing the stale gpio.h, but I think it
> was the i2c.h that was now also stale. So I removed both - even though
> technically, the merge should have left i2c.h since it was in both
> parents. You should double-check that, but I don't see how that
> <linux/i2c.h> could *possibly* be valid any more, and people had tried
> (unsuccessfully) to remove it once already, so...

The i2c include is definitely unnecessary since there's no
i2c_board_info stuff left in the file. Thanks for catching that.


-Olof
--
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/