diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-20 05:29:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-20 05:29:34 +0100 |
| commit | a8a8a669ea13d792296737505adc43ccacf3a648 (patch) | |
| tree | c1a2bbb7bde9ff745651c25b810d6da4c5917b42 /fs/dlm/member.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | i2c: i2c-pnx: Added missing mach/i2c.h and linux/io.h header file includes (diff) | |
| download | linux-a8a8a669ea13d792296737505adc43ccacf3a648.tar.xz linux-a8a8a669ea13d792296737505adc43ccacf3a648.zip | |
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/member.c')
0 files changed, 0 insertions, 0 deletions