Merge branch 'for-3.11' into for-next

author Tejun Heo <tj@kernel.org>

Tue, 21 May 2013 23:54:23 +0000 (08:54 +0900)

committer Tejun Heo <tj@kernel.org>

Tue, 21 May 2013 23:54:23 +0000 (08:54 +0900)
author Tejun Heo <tj@kernel.org>
Tue, 21 May 2013 23:54:23 +0000 (08:54 +0900)
committer Tejun Heo <tj@kernel.org>
Tue, 21 May 2013 23:54:23 +0000 (08:54 +0900)
diff --cc drivers/ata/ahci.c
Simple merge
diff --cc drivers/ata/ahci.h
Simple merge
diff --cc drivers/ata/libahci.c
Simple merge
author	Tejun Heo <tj@kernel.org>
	Tue, 21 May 2013 23:54:23 +0000 (08:54 +0900)
committer	Tejun Heo <tj@kernel.org>
	Tue, 21 May 2013 23:54:23 +0000 (08:54 +0900)
		1	2
drivers/ata/ahci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ata/ahci.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ata/libahci.c	patch \|	diff1 \|	diff2 \|	blob \| history