Merge branch 'for-3.2/core' into for-3.2/drivers

Browse source

...

This commit is contained in:

Jens Axboe 2011-08-23 20:01:11 +02:00

parent dfaa2ef68e d27769ec3d

commit e8b177cedc

4 changed files with 8 additions and 6 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

4

block/genhd.c

View file

2

block/ioctl.c

View file

2

fs/block_dev.c

View file

6

include/linux/genhd.h

View file