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

Browse source

...

This commit is contained in:

Greg Kroah-Hartman 2006-08-21 10:24:02 -07:00

parent da547d775f be33c3a67b

commit ae298c98e5

4 changed files with 32 additions and 25 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

2

block/cfq-iosched.c

View file

2

block/ll_rw_blk.c

View file

30

fs/ioprio.c

View file

23

include/linux/ioprio.h

View file