]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.16' into for-next
authorTejun Heo <tj@kernel.org>
Wed, 21 May 2014 19:38:43 +0000 (15:38 -0400)
committerTejun Heo <tj@kernel.org>
Wed, 21 May 2014 19:38:43 +0000 (15:38 -0400)
commit5b32c21d52ccf664965c27ade11ba0187b41b85f
treeda38ee708561840cac8b0542f2abaa141c4e99c7
parent6e89aa37e4fe825153f54d1b5eb39ed979d25c1d
parentd0f5aa9cf6a479884cda95018363ba9ed31d9cbd
Merge branch 'for-3.16' into for-next

Conflicts:
drivers/ata/ahci.h
drivers/ata/ahci.h
drivers/ata/ahci_imx.c
drivers/ata/libahci.c