diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-02 20:34:03 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-02 20:34:03 (GMT) |
| commit | 115e8e705e4be071b9e06ff72578e3b603f2ba65 (patch) | |
| tree | 8ef96f62ed5239442cd55ad54ea5c97b0441e613 /drivers/block/amiflop.c | |
| parent | 733bbb7e1c3acb8fabc55595bf1df8973dde7736 (diff) | |
| parent | f88e1ae8acb8affac29034ed79d4fff95ac8c29d (diff) | |
| download | linux-fsl-qoriq-115e8e705e4be071b9e06ff72578e3b603f2ba65.tar.xz | |
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
dt/device: Fix auxdata matching to handle entries without a name override
Diffstat (limited to 'drivers/block/amiflop.c')
0 files changed, 0 insertions, 0 deletions