diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:12:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:12:10 -0700 |
commit | f74d505b58d36ceeef10e459094f0eb760681165 (patch) | |
tree | 94f5cd7bfda9b1e0c4dd4b15d0f902f20b97a717 /kernel/futex.c | |
parent | 45ea2103d8856454503b30464cc1dba378748d00 (diff) | |
parent | 2961b423037da60a8cb230963ee0d8c04473d73b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
fix asm-mips/types.h syntax error
fix asm-alpha/types.h breakage
Diffstat (limited to 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions