diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-10 01:03:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-10 01:03:59 +0300 |
| commit | 1b7e7e6ffc08b3a8fb27bccd8fc740d77758db5b (patch) | |
| tree | 7d1592cccc0125171245931b9a8dd2bf5a7a665c /net/unix/af_unix.c | |
| parent | fbf855d7c709e991ff5445d4bac432a08b942baa (diff) | |
| parent | 6dbc2f35ab457770d121d119788fc89c79124734 (diff) | |
| download | linux-1b7e7e6ffc08b3a8fb27bccd8fc740d77758db5b.tar.xz | |
Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux
* 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
i2c-eg20t: include slab.h for memory allocations
i2c-ocores: Fix pointer type mismatch error
i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions