From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2016 02:07:10 +0000 (-0700)
Subject: Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=06d2e7812ecd1b585c5e9e7bda8ee90acebaef8c;p=deliverable%2Flinux.git

Merge branch 'i2c/for-next' of git://git./linux/kernel/git/wsa/linux

Pull more i2c updates from Wolfram Sang:
 "Here is the second pull request from I2C for this merge window:

   - one new feature (which nearly fell through the cracks): i2c-dev
     does now use the cdev API so it can handle >256 minors.  Seems
     people do need that.

   - two fixes for the just added DMA feature for i2c-rcar

   - some typo fixes"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: dev: don't start function name with 'return'
  i2c: dev: switch from register_chrdev to cdev API
  i2c: xlr: rename ARCH_TANGOX to ARCH_TANGO
  i2c: at91: change log when dma configuration fails
  misc: at24: Fix typo in at24 header file
  i2c: rcar: should depend on HAS_DMA
  i2c: rcar: use dma_request_chan()
---

06d2e7812ecd1b585c5e9e7bda8ee90acebaef8c