| commit | 8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sat Jul 28 19:31:13 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sat Jul 28 19:31:13 2007 -0700 |
| tree | 3c451f9c21123046806724680a3a8aebd48e6247 | |
| parent | 933a6208d84c92d92f9264a2e28d0fc317d41fd1 [diff] | |
| parent | 79685b8deea4541d18882d8c07d0e99e788292ab [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: docbook: add pipes, other fixes blktrace: use cpu_clock() instead of sched_clock() bsg: Fix build for CONFIG_BLOCK=n [patch] QUEUE_FLAG_READFULL QUEUE_FLAG_WRITEFULL comment fix