diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-02-29 15:27:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-02-29 15:27:30 +1100 |
| commit | a12087f4e653062611b4913675c7644086ffdad2 (patch) | |
| tree | 92d4fde0e4e2bc747e277d3a5e24c706d4a6ea29 /include/asm-generic | |
| parent | 73bc64350b3b26d3e5d67635959b59fd7d823925 (diff) | |
| parent | 890f841dac014ee441cf8471efb9db666d34a6de (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
arch/avr32/kernel/semaphore.c
include/linux/memory.h
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions