From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Aug 2010 18:57:54 +0000 (-0700)
Subject: Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.36-rc1~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0a0c28cf178943afaf22f87957b73c47497cb4b;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux

* 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux:
  i2c/nuc900: add i2c driver support for nuc900
  i2c: Enable NXP LPC support in Kconfig
  i2c-pxa: fix compiler warning, due to missing const
  i2c: davinci: bus recovery procedure to clear the bus
  i2c: davinci: Add cpufreq support
  i2c: davinci: Add suspend/resume support
  i2c: davinci: Add helper functions for power management
  i2c: davinci: misc. cleanups: remove MOD_REG_BIT and IO_ADDRESS usage
  i2c: davinci: Fix smbus Oops with AIC33 usage
---

d0a0c28cf178943afaf22f87957b73c47497cb4b