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)
commit23a39eede5f04eb8c4e8d6622231d98fe46bdc65
treedb83c18d46157b1958d7af64381a52cec2a4c2d9
parentb656eba122929881c52d38ae16637167aaa5b88b
parent96c16743973e8c1a7b9c655d10b7973408d6d1dd
Merge branch 'for-linus' into for-next
drivers/ide/ide-cd.c