diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-20 07:29:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-20 07:29:34 +0300 |
| commit | a8a8a669ea13d792296737505adc43ccacf3a648 (patch) | |
| tree | c1a2bbb7bde9ff745651c25b810d6da4c5917b42 /fs/dlm/plock.c | |
| parent | 931ed94430e36b9bea3904572424116092ba5663 (diff) | |
| parent | a7d73d8c686d919cc18dec63e5e194f0e5a7206e (diff) | |
| download | linux-a8a8a669ea13d792296737505adc43ccacf3a648.tar.xz | |
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
Diffstat (limited to 'fs/dlm/plock.c')
0 files changed, 0 insertions, 0 deletions