diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 02:12:10 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 02:12:10 +0200 |
commit | f74d505b58d36ceeef10e459094f0eb760681165 (patch) | |
tree | 94f5cd7bfda9b1e0c4dd4b15d0f902f20b97a717 /kernel/futex.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86... (diff) | |
parent | fix asm-mips/types.h syntax error (diff) | |
download | linux-f74d505b58d36ceeef10e459094f0eb760681165.tar.xz linux-f74d505b58d36ceeef10e459094f0eb760681165.zip |
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 '')
0 files changed, 0 insertions, 0 deletions