From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: i2c-next pull request Date: Mon, 5 Jan 2009 19:01:34 -0800 (PST) Message-ID: References: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: In-Reply-To: Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Ben Dooks Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-i2c@vger.kernel.org On Mon, 5 Jan 2009, Ben Dooks wrote: > > are available in the git repository at: > > git://aeryn.fluff.org.uk/bjdooks/linux.git i2c-next I fixed up a conflict that _looked_ trivial in drivers/i2c/busses/i2c-s3c2410.c, and since I can't even compile-test it, you should double-check. We had one branch remove the need for regs-gpio.h, and the ARM merge had moved the header files around.. All the commits in question were actually yours, they just came in from different trees. So if it's not right, I'm sure you can fix it up ;) Linus