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

Browse source

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] blktrace: don't return blktrace_seq from trace_note()
  [PATCH] blktrace: uninline trace_note()

...

This commit is contained in:

Linus Torvalds 2006-12-04 19:38:30 -08:00

parent 651857a1ec a863055b10

commit 2d941e99df

1 changed files with 16 additions and 19 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

33

block/blktrace.c

View file