[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAOesGMiMWaEmPMJ2q2t9gsTa2gFZm_iwc6v9wO7htyPrOKNx=Q@mail.gmail.com>
Date: Thu, 28 Feb 2013 22:19:58 -0800
From: Olof Johansson <olof@...om.net>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Chris Ball <cjb@...top.org>, Arnd Bergmann <arnd@...db.de>,
linux-arm-kernel@...ts.infradead.org,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
ARM SoC <arm@...nel.org>
Subject: Re: [GIT PULL 0/3] arm-soc: late changes for 3.9
On Thu, Feb 28, 2013 at 8:18 PM, Linus Torvalds
<torvalds@...ux-foundation.org> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists