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

Conflicts:
	drivers/ide/ide-tape.c
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-06-13 12:00:54 +02:00
commit 8dcce40813
6 changed files with 230 additions and 261 deletions