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

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2009-05-20 08:56:10 -07:00

parent 929a8651f4 d3375ea721

commit 6c2445efb8

2 changed files with 7 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/block/xen-blkfront.c

View file

2

drivers/cdrom/viocd.c

View file