Merge branch 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:58:13 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:58:13 +0000 (08:58 -0700)
commit9a22e330e9cbab8deab2db913a0d37bb99140ecb
treeda94fdd4e28ca0ac0548f54fdc00a077eca18d7f
parent4d3fac08718b49fc256bdb447a479d089ca97b78
parentae3ba4fd966e38d8d766d19f7a58b551df8ecc97
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