From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 May 2009 15:56:10 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.30-rc7~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6c2445efb816a34dab7bb7357317e2d656f14cb1;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cdrom: beyond ARRAY_SIZE of viocd_diskinfo
  xen/blkfront: fix warning when deleting gendisk on unplug/shutdown
  xen/blkfront: allow xenbus state transition to Closing->Closed  when not Connected
---

6c2445efb816a34dab7bb7357317e2d656f14cb1