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)
commit4c9773ed7946fc375edba057770f5ef16d8b44fe
treecd642c901d6b6f051cbe7a29e6565913e61f0614
parent9f36d31437922354d104a2db407f397e79e4027e
parent5993856e53fbc4b4f28e2d481deaebeb715b1267
Merge branch 'for-linus' into for-next
drivers/ide/ide-io.c
drivers/ide/ide-probe.c
include/linux/ide.h