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)
commit6250d3af2a1036fb356264442211a4246c7d64c7
tree12474d59b96c0dc518159cb694f0e654cb18b5f6
parent4c9773ed7946fc375edba057770f5ef16d8b44fe
parent075affcbe01d4d7cefcd0e30a98df1253bcf8d92
Merge branch 'for-linus' into for-next
drivers/ide/ide-disk.c
include/linux/ide.h