| commit | 83e95697143d341f3c670c4c5cda0268ae198e63 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 11 12:46:39 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 11 12:46:39 2011 -0700 |
| tree | c7591f919b31c93250d7da438baca348c33703f3 | |
| parent | 404ba3f029a53597928a20ce33351e77e3259840 [diff] | |
| parent | 7f7e37115a8b6724f26d0637a04e1d35e3c59717 [diff] |
Merge branch 'movieboard' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'movieboard' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: ohci: do not bind to Pinnacle cards, avert panic