Merge branch 'for-linus' into for-next
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Thu, 30 Apr 2009 16:28:35 +0000 (18:28 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Thu, 30 Apr 2009 16:28:35 +0000 (18:28 +0200)
1  2 
drivers/ide/ide-cd.c

Simple merge