tree b4ce999c18a27fab4c41e802abc39944727bd0e7
parent 929a8651f42544f2b94ec149dfb2901e0c0ee427
parent d3375ea7213d09284ee3683d8bc075b9d3786a03
author Linus Torvalds <torvalds@linux-foundation.org> 1242834970 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242834970 -0700

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