Merge tag 'v2.6.39-rc7'
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 10 May 2011 18:52:07 +0000 (20:52 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 10 May 2011 20:50:41 +0000 (22:50 +0200)
in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.

1  2 
drivers/firewire/ohci.c

Simple merge