From: Linus Torvalds Date: Fri, 20 Nov 2009 04:29:34 +0000 (-0800) Subject: Merge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux X-Git-Tag: firefly_0821_release~11852 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8a8a669ea13d792296737505adc43ccacf3a648;p=firefly-linux-kernel-4.4.55.git Merge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux * 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux: i2c: i2c-pnx: Added missing mach/i2c.h and linux/io.h header file includes i2c: i2c-pnx: Made buf type unsigned to prevent sign extension i2c: i2c-pnx: Limit minimum jiffie timeout to 2 --- a8a8a669ea13d792296737505adc43ccacf3a648