Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
commit70057a5a61a9c703aac0cc51811de8d3384d2889
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Sep 2010 17:23:08 +0000 (17 10:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Sep 2010 17:23:08 +0000 (17 10:23 -0700)
treedbc78019d3dab85d43baa11fe661e4a3eaeb61a6
parent343d04d44bb069064180f5763a41acaa9245f8e6
parent8702d33aa6e6d753ef99163afe48aba1323374ef
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* '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
drivers/Makefile