summaryrefslogtreecommitdiffstats
path: root/fs/partitions/amiga.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-12 10:02:04 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-12 10:02:04 +0100
commit90d0be2fc33b4c4e11fc596da4736189be947d99 (patch)
tree0dd7e261f8d79d933c0a93c1a714b9a72fa05c28 /fs/partitions/amiga.c
parentf43aa025b7de79d6a615ea4c1e6be7e6b1cea538 (diff)
parentd7a8943635485597ae7c6d554a8ccf3ce5a42d2d (diff)
Merge branch 'topic/fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'fs/partitions/amiga.c')
0 files changed, 0 insertions, 0 deletions