Merge branch 'for-linus' into for-next

Browse source

...

This commit is contained in:

Jens Axboe 2010-11-15 10:25:49 +01:00

parent 0143832cc9 d69b78ba1d

commit 82cc2e4b51

2 changed files with 39 additions and 47 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

55

drivers/block/xen-blkfront.c

View file

31

fs/ioprio.c

View file