]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ieee1394/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:24:18 +0000 (10:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:24:18 +0000 (10:24 +1000)
1  2 
drivers/firewire/core-transaction.c
include/linux/firewire.h

Simple merge
Simple merge