commit | 8dcce4081305d3d1629190edd112e6473c315cbc | [log] [tgz] |
---|---|---|
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | Sat Jun 13 12:00:54 2009 +0200 |
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | Sat Jun 13 12:00:54 2009 +0200 |
tree | 343c7167f6a3d2a77b01d50cf54c67bdd6faccd1 | |
parent | f3ad116588151b3371ae4e092290e4f48e62b8bb [diff] | |
parent | 103f7033bd0f7b65ff3e0a5ea72449d08010b031 [diff] |
Merge branch 'bp-remove-pc-buf' into for-next Conflicts: drivers/ide/ide-tape.c