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)
Conflicts:
drivers/ide/ide-tape.c


Trivial merge