diff options
| author | Linus Torvalds <[email protected]> | 2014-01-01 19:35:27 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-01-01 19:35:27 +0000 |
| commit | 6c72139fb1268813b4fdf53a9aba0166f38d92cc (patch) | |
| tree | 249f4db883e2b2d20a5e70803a85fc22b093b91e /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | crypto: ixp4xx - Fix kernel compile error (diff) | |
| download | kernel-6c72139fb1268813b4fdf53a9aba0166f38d92cc.tar.gz kernel-6c72139fb1268813b4fdf53a9aba0166f38d92cc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"Fix a build error on ARM that was introduced in 3.13-rc1"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ixp4xx - Fix kernel compile error
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions