diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /fs/block_dev.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index c1511c674f5..5147bdd3b8e 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -653,7 +653,7 @@ void bd_forget(struct inode *inode) | |||
| 653 | * @whole: whole block device containing @bdev, may equal @bdev | 653 | * @whole: whole block device containing @bdev, may equal @bdev |
| 654 | * @holder: holder trying to claim @bdev | 654 | * @holder: holder trying to claim @bdev |
| 655 | * | 655 | * |
| 656 | * Test whther @bdev can be claimed by @holder. | 656 | * Test whether @bdev can be claimed by @holder. |
| 657 | * | 657 | * |
| 658 | * CONTEXT: | 658 | * CONTEXT: |
| 659 | * spin_lock(&bdev_lock). | 659 | * spin_lock(&bdev_lock). |