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)
commit020abf03cd659388f94cb328e1e1df0656e0d7ff
tree40d05011708ad1b4a05928d167eb120420581aa6
parent0ff8fbc61727c926883eec381fbd3d32d1fab504
parent693d92a1bbc9e42681c42ed190bd42b636ca876f
Merge tag 'v2.6.39-rc7'

in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.
drivers/firewire/ohci.c