]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-linus' into for-next
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 22 Apr 2009 18:38:45 +0000 (20:38 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 22 Apr 2009 18:38:45 +0000 (20:38 +0200)
1  2 
drivers/ide/ide-cd.c

Simple merge