Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2016 19:03:34 +0000 (11:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2016 19:03:34 +0000 (11:03 -0800)
Pull i2c fix from Wolfram Sang:
 "One I2C bugfix ensuring correct memory allocation in a driver"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: brcmstb: allocate correct amount of memory for regmap


Trivial merge