diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-11 21:46:39 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-11 21:46:39 +0200 |
commit | 83e95697143d341f3c670c4c5cda0268ae198e63 (patch) | |
tree | c7591f919b31c93250d7da438baca348c33703f3 /drivers/w1/slaves/w1_ds2780.h | |
parent | ath5k: Add missing breaks in switch/case (diff) | |
parent | firewire: ohci: do not bind to Pinnacle cards, avert panic (diff) | |
download | linux-83e95697143d341f3c670c4c5cda0268ae198e63.tar.xz linux-83e95697143d341f3c670c4c5cda0268ae198e63.zip |
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
Diffstat (limited to 'drivers/w1/slaves/w1_ds2780.h')
0 files changed, 0 insertions, 0 deletions