diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-13 06:00:54 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-13 06:00:54 -0400 |
| commit | 8dcce4081305d3d1629190edd112e6473c315cbc (patch) | |
| tree | 343c7167f6a3d2a77b01d50cf54c67bdd6faccd1 /include/linux/ata.h | |
| parent | f3ad116588151b3371ae4e092290e4f48e62b8bb (diff) | |
| parent | 103f7033bd0f7b65ff3e0a5ea72449d08010b031 (diff) | |
Merge branch 'bp-remove-pc-buf' into for-next
Conflicts:
drivers/ide/ide-tape.c
Diffstat (limited to 'include/linux/ata.h')
0 files changed, 0 insertions, 0 deletions