From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 May 2009 18:21:51 +0000 (-0700)
Subject: Merge branch 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=816dc3c82b34f709dc1c29ea0a6f417d739a3487;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-cpm: Pass dev ptr to dma_*_coherent rather than NULL
  i2c: Enable i2c-s3c2410 for S3C64XX too
  i2c-mpc: bug fix for MPC52xx clock setting and printout
  i2c-pxa.c: timeouts off by 1
---

816dc3c82b34f709dc1c29ea0a6f417d739a3487