diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 18:49:10 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 18:49:10 +0100 |
commit | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (patch) | |
tree | 89505069cd4f46253c649bcd418a9e3cd26fc55f /kernel/resource.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | ieee1394: add quirk fix for Freecom HDD (diff) | |
download | linux-1bda71282ded6a2e09a2db7c8884542fb46bfd4f.tar.xz linux-1bda71282ded6a2e09a2db7c8884542fb46bfd4f.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: add quirk fix for Freecom HDD
Diffstat (limited to 'kernel/resource.c')
0 files changed, 0 insertions, 0 deletions