Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-mmc

This commit is contained in:
Greg Kroah-Hartman 2006-08-10 15:10:01 -07:00
commit c4e321b85a
2 changed files with 7 additions and 5 deletions