On Mon, Jan 05, 2009 at 07:01:34PM -0800, Linus Torvalds wrote: > > > 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 ;) Thanks, it compiles fine on the s3c6400, will test the s3c24xx build later. -- Ben (ben@xxxxxxxxx, http://www.fluff.org/) 'a smiley only costs 4 bytes' -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
