diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-07 13:33:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-07 13:33:30 +1100 |
| commit | 7442a209e80b2902d662b6c6c7dd44127202a698 (patch) | |
| tree | ab24af41a0c7cb94c10fae6e23a50242b6f92846 /ipc/util.h | |
| parent | 7a82358dc05e9e29339d6db520debc91857738b0 (diff) | |
| parent | dd7f90fb66bd2736c71f809558a841287130dc70 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
arch/sparc/kernel/Makefile
include/linux/memory.h
net/tipc/socket.c
Diffstat (limited to 'ipc/util.h')
0 files changed, 0 insertions, 0 deletions