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)
commit7addb7fa1085e29398c2aef43f0b98c3c4b7e749
tree018732a4fc23772498f64e62706066087fc733a4
parent3e09b7e93dae6cd9fcabc5dd36fc6973d3049c30
parent7314d22a2f5bd40468d57768be368c3d9b4bd726
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

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