diff options
| author | Russell King <[email protected]> | 2012-01-05 13:24:33 +0000 |
|---|---|---|
| committer | Russell King <[email protected]> | 2012-01-05 13:24:33 +0000 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /net/unix/af_unix.c | |
| parent | Merge branches 'fixes' and 'misc' into for-linus (diff) | |
| parent | ARM: 7269/1: mach-sa1100: fix sched_clock breakage (diff) | |
| download | kernel-2e0e943436912ffe0848ece58167edfe754edb96.tar.gz kernel-2e0e943436912ffe0848ece58167edfe754edb96.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions