tree c1a2bbb7bde9ff745651c25b810d6da4c5917b42
parent 931ed94430e36b9bea3904572424116092ba5663
parent a7d73d8c686d919cc18dec63e5e194f0e5a7206e
author Linus Torvalds <torvalds@linux-foundation.org> 1258691374 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258691374 -0800

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