From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Feb 2009 23:40:19 +0000 (-0800)
Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: firefly_0821_release~15447
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  Add i2c_board_info for RiscPC PCF8583
  i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent
  i2c-dev: Clarify the unit of ioctl I2C_TIMEOUT
  i2c: Timeouts reach -1
  i2c: Fix misplaced parentheses
---

21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d