Merge remote-tracking branch 'libata/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc drivers/ata/Kconfig
Simple merge
diff --cc drivers/ata/ahci.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ata/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ata/ahci.c	patch \|	diff1 \|	diff2 \|	blob \| history