summaryrefslogtreecommitdiffstats
path: root/fs/jbd
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-21 08:27:04 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-21 08:27:04 +0100
commit75a287d9a35a825cb758d2f8d8df93d41f9f8e3e (patch)
tree7aacf881315a16695e35ca810434e42666d26a55 /fs/jbd
parent1725b82a6e2721612a3572d0336f51f1f1c3cf54 (diff)
parent3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0 (diff)
downloadop-kernel-dev-75a287d9a35a825cb758d2f8d8df93d41f9f8e3e.zip
op-kernel-dev-75a287d9a35a825cb758d2f8d8df93d41f9f8e3e.tar.gz
Merge branch 'topic/fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'fs/jbd')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud