Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 481ff126 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' into pata-drivers

parents 669a5db4 9bec2e38

include/linux/ata.h

+2 −2

File changed.

Contains only whitespace changes.

include/linux/libata.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/ata/ahci.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/ata/pdc_adma.c

+1 −1

File changed.

Contains only whitespace changes.