diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-16 10:45:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-16 10:45:45 -0400 |
commit | 6af74b03e00fc78806f75f6701b24b582bbb5c96 (patch) | |
tree | f2370760e5096b75c07baa98084576c6fb906191 /include/asm-um/elf-i386.h | |
parent | 1076bb40585dc3a4ae6143ecc5a1654495b84c42 (diff) | |
parent | 75ce6faccdbbea4465876a759917d4994660c025 (diff) |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: update git url for blktrace
io context: increment task attachment count in ioc_task_link()
Diffstat (limited to 'include/asm-um/elf-i386.h')
0 files changed, 0 insertions, 0 deletions