| commit | a8a8a669ea13d792296737505adc43ccacf3a648 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 19 20:29:34 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 19 20:29:34 2009 -0800 |
| tree | c1a2bbb7bde9ff745651c25b810d6da4c5917b42 | |
| parent | 931ed94430e36b9bea3904572424116092ba5663 [diff] | |
| parent | a7d73d8c686d919cc18dec63e5e194f0e5a7206e [diff] |
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