Merge branch 'for-linus' into for-next
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sun, 7 Jun 2009 12:27:11 +0000 (14:27 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sun, 7 Jun 2009 12:27:11 +0000 (14:27 +0200)
1  2 
drivers/ide/ide-disk.c
include/linux/ide.h

Simple merge
Simple merge