Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux
commit9bbd055808248a7adc78161472d3301285252361
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 23:55:33 +0000 (12 16:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 23:55:33 +0000 (12 16:55 -0700)
tree9278fd9cddaea9e5932ce6478242927098f6aeb6
parent411f05f123cbd7f8aa1edcae86970755a6e2a9d9
parent9ddabb055d73c63037878bb9346e52c7f2e07e96
Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux

* 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c: pnx: Fix crash due to wrong init of timer->data