commit | 350bb4bebf5d80937eb41b39509779888bc8aa75 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 28 10:55:44 2014 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 28 10:55:44 2014 -0700 |
tree | e4d53867511a508ec8363725fa0c976b1d554520 | |
parent | 81250437a55044edf16d2cc484da4fb837489317 [diff] | |
parent | 5f12c5eca6e6b7aeb4b2028d579f614b4fe7a81f [diff] |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux Pull i2c build fix from Wolfram Sang: "The build fix from my last request unveiled another build problem which is fixed with this patch" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: cpm: Fix build by adding of_address.h and of_irq.h