Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:55:56 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:55:56 +0000 (15:55 -0700)
commit996a798abb36aa92d0bad64ba23f4c685ce39537
tree77e2b9cbccc55862a0fd14eabdcb21521d98b70b
parenta57c21c7159e07c27e317ea3513dfb382be3f153
parent5d3f33318a6c1f79f89e3dd2c7ddc11e0da14895
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