Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 5 May 2006 21:53:48 +0000 (14:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 5 May 2006 21:53:48 +0000 (14:53 -0700)
* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [BLOCK] Fix oops on removal of SD/MMC card


Trivial merge