tree 77e2b9cbccc55862a0fd14eabdcb21521d98b70b
parent a57c21c7159e07c27e317ea3513dfb382be3f153
parent 5d3f33318a6c1f79f89e3dd2c7ddc11e0da14895
author Linus Torvalds <torvalds@linux-foundation.org> 1253487356 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253487356 -0700

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

* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
  [PATCH] i2c-imx: make bus available early
  i2c-mv64xxx: correct mv64xxx_i2c_intr() return type