tree c07ee70a42bdf046d0ce8540b4e86d2c16f05b6c
parent ce00f7feb0a497b4280e1efe16e03728ed292687
parent f6e1901c4c596238abe6735bb20593f2734f757e
author Linus Torvalds <torvalds@linux-foundation.org> 1281812274 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281812274 -0700

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