diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 08:25:40 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 08:25:40 +0400 |
commit | c14c06b77d151352a4de73505e954b6df55fd23b (patch) | |
tree | a37a5f47e92b854251efc53b9dfcfe748e822d53 /security/smack | |
parent | 53611c0ce9f6e2fa2e31f9ab4ad8c08c512085ba (diff) | |
parent | 62c19c9d29e65086e5ae76df371ed2e6b23f00cd (diff) | |
download | linux-c14c06b77d151352a4de73505e954b6df55fd23b.tar.xz |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c Kconfig fix from Wolfram Sang.
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: Remove usage of orphaned symbol OF_I2C
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions