projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 929a865 d3375ea)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 15:56:10 +0000 (08:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 15:56:10 +0000 (08:56 -0700)
* '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


Trivial merge
John Crispins staging tree