Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

Browse source

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  blktrace: kill the unneeded initcall
  block: fix blktrace timestamps
  loop: fix bad bio_alloc() nr_iovec request
  Don't blatt first element of prv in sg_chain()

...

This commit is contained in:

Linus Torvalds 2008-01-11 11:44:59 -08:00

parent 646fd12784 11a57153e3

commit b506d1b6c4

3 changed files with 6 additions and 81 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

81

block/blktrace.c

View file

2

drivers/block/loop.c

View file

4

include/linux/scatterlist.h

View file