tree 343c7167f6a3d2a77b01d50cf54c67bdd6faccd1
parent f3ad116588151b3371ae4e092290e4f48e62b8bb
parent 103f7033bd0f7b65ff3e0a5ea72449d08010b031
author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 1244887254 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 1244887254 +0200

Merge branch 'bp-remove-pc-buf' into for-next

Conflicts:
	drivers/ide/ide-tape.c