From: Linus Torvalds <torvalds@linux-foundation.org>
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: v2.6.32~61
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=a8a8a669ea13d792296737505adc43ccacf3a648;hp=a8a8a669ea13d792296737505adc43ccacf3a648

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