From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Mar 2011 22:03:59 +0000 (-0800)
Subject: Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.38~35
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1b7e7e6ffc08b3a8fb27bccd8fc740d77758db5b;p=~emulex%2Finfiniband.git

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
---

1b7e7e6ffc08b3a8fb27bccd8fc740d77758db5b