diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 05:25:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 05:25:40 +0100 |
| commit | c14c06b77d151352a4de73505e954b6df55fd23b (patch) | |
| tree | a37a5f47e92b854251efc53b9dfcfe748e822d53 /security/keys/keyring.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | i2c: Remove usage of orphaned symbol OF_I2C (diff) | |
| download | linux-c14c06b77d151352a4de73505e954b6df55fd23b.tar.xz linux-c14c06b77d151352a4de73505e954b6df55fd23b.zip | |
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/keys/keyring.c')
0 files changed, 0 insertions, 0 deletions