]> 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>
Fri, 17 Sep 2010 17:23:08 +0000 (10:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Sep 2010 17:23:08 +0000 (10:23 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: nosy: fix build when CONFIG_FIREWIRE=N
  firewire: ohci: activate cycle timer register quirk on Ricoh chips

1  2 
drivers/Makefile

Simple merge