Merge remote-tracking branch 'target-merge/for-next-merge'

diff --cc drivers/firewire/core-card.c
Simple merge

diff --cc drivers/firewire/core-transaction.c
Simple merge

diff --cc drivers/firewire/core.h
Simple merge

diff --cc include/linux/firewire.h
Simple merge