]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Oct 2010 20:09:26 +0000 (13:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Oct 2010 20:09:26 +0000 (13:09 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: ohci: fix TI TSB82AA2 regression since 2.6.35


Trivial merge