Commits

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