From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 13 Jun 2009 10:00:54 +0000 (+0200)
Subject: Merge branch 'bp-remove-pc-buf' into for-next
X-Git-Tag: v2.6.31-rc1~103^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dcce4081305d3d1629190edd112e6473c315cbc;p=pandora-kernel.git

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

Conflicts:
	drivers/ide/ide-tape.c
---

8dcce4081305d3d1629190edd112e6473c315cbc
Reading git-diff-tree failed