]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ieee1394/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:42:38 +0000 (10:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:42:38 +0000 (10:42 +1000)
1  2 
drivers/firewire/core-device.c

Simple merge