diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 14:45:10 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 14:45:10 (GMT) |
| commit | 8e775167d54e6521e7cdbc03ee7ec42a8c67b49a (patch) | |
| tree | a49914306fb28505c6e21a456df8bdc40d6eac23 /drivers/ide/rz1000.c | |
| parent | 4b37ba90f49d4157ac5628f8d730d3505f176724 (diff) | |
| parent | f253b86b4ad1b3220544e75880510fd455ebd23f (diff) | |
| download | linux-fsl-qoriq-8e775167d54e6521e7cdbc03ee7ec42a8c67b49a.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "block: fix accounting bug on cross partition merges"
Diffstat (limited to 'drivers/ide/rz1000.c')
0 files changed, 0 insertions, 0 deletions