git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0a86e1c 5ba59b5)

author	Tejun Heo <tj@kernel.org>
	Wed, 5 Jun 2013 02:49:57 +0000 (19:49 -0700)
committer	Tejun Heo <tj@kernel.org>
	Wed, 5 Jun 2013 02:49:57 +0000 (19:49 -0700)
commit	17039efb836eca349c6533bb5854fdb7a02a5cd3
tree	17a05fc95b9c5084e9f90f202ad48d5b21c825df	tree \| snapshot
parent	0a86e1c857134efe2cdb31d74bc7ea21721db494	commit \| diff
parent	5ba59b59cb413b9d89f40532bad3529d5185dd3c	commit \| diff

Merge branch 'for-3.10-fixes' into for-next

Conflicts:
drivers/ata/sata_rcar.c

drivers/ata/acard-ahci.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/ahci.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/ahci.h	diff1 \|	diff2 \|	blob \| history
drivers/ata/ata_piix.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libahci.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/sata_rcar.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/sata_sil.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules