]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'master' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 10 Mar 2012 16:42:19 +0000 (17:42 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 10 Mar 2012 16:42:19 +0000 (17:42 +0100)
1  2 
drivers/firewire/ohci.c
drivers/firewire/sbp2.c

Simple merge
Simple merge