]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'bp-remove-pc-buf' into for-next
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 13 Jun 2009 10:00:54 +0000 (12:00 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 13 Jun 2009 10:00:54 +0000 (12:00 +0200)
commit8dcce4081305d3d1629190edd112e6473c315cbc
tree343c7167f6a3d2a77b01d50cf54c67bdd6faccd1
parentf3ad116588151b3371ae4e092290e4f48e62b8bb
parent103f7033bd0f7b65ff3e0a5ea72449d08010b031
Merge branch 'bp-remove-pc-buf' into for-next

Conflicts:
drivers/ide/ide-tape.c
drivers/ide/ide-atapi.c
drivers/ide/ide-cd.c
drivers/ide/ide-tape.c
include/linux/ide.h