git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbf855d 6dbc2f3)
Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:03:59 +0000 (14:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:03:59 +0000 (14:03 -0800)
* '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


Trivial merge
Pandora Kernel Repository