diff options
| author | David S. Miller <[email protected]> | 2011-05-20 20:10:22 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2011-05-20 20:10:22 +0000 |
| commit | 90d3ac15e5c637d45849e83c828ed78c62886737 (patch) | |
| tree | c5568365f32386559d2710e8981ed41e5fe0eb12 /net/unix/af_unix.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp... (diff) | |
| parent | sched: Move the second half of ttwu() to the remote cpu (diff) | |
| download | kernel-90d3ac15e5c637d45849e83c828ed78c62886737.tar.gz kernel-90d3ac15e5c637d45849e83c828ed78c62886737.zip | |
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
Conflicts:
arch/sparc/kernel/smp_32.c
With merge conflict help from Daniel Hellstrom.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions