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)
commit24fc484ab2291d242d1d6bfb5ca5b781061a8578
treeea1d38f9ee40fd3b680f030d28b8aebb0f84b789
parent2ecf0a57c60dcb588f310d94412118e15c510532
parent83cff839268feb2f31ae7667b9b2b7641dc10575
Merge branch 'for-linus' into for-next
drivers/ide/ide-cd.c