From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 May 2009 23:48:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.30-rc5~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b39da786a63e82d9d440075eae9018b79154d2a;p=pandora-kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/bart/ide-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-cd: fix REQ_QUIET tests in cdrom_decode_status

Fix up trivial conflicts in include/linux/blkdev.h
---

7b39da786a63e82d9d440075eae9018b79154d2a
Reading git-diff-tree failed