Merge branch 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block

* 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block:
  cdrom_open() forgets to unlock on -EROFS failure exits
This commit is contained in:
Linus Torvalds 2007-09-26 08:58:13 -07:00
commit 9a22e330e9