Merge branch 'for-linus' into for-next
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 22 May 2009 15:10:55 +0000 (17:10 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 22 May 2009 15:10:55 +0000 (17:10 +0200)
1  2 
drivers/ide/ide-io.c
drivers/ide/ide-probe.c
include/linux/ide.h

Simple merge
Simple merge
Simple merge