summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-02-05 19:57:23 +0100
committerTakashi Iwai <tiwai@suse.de>2010-02-05 19:57:23 +0100
commit3e0b33f786e7f950f2430a305169f3db4a1a5521 (patch)
tree7b07ae1233bb0ea11ec3b8923e866a25c3e19187 /block/blk-merge.c
parenta26a408888b2968d5de5af233655f6497ac5623f (diff)
parent9d4c7464458770d309169f7a7ce1ea6f8a4a7de5 (diff)
downloadlinux-3e0b33f786e7f950f2430a305169f3db4a1a5521.tar.bz2
Merge remote branch 'alsa/fixes' into for-linus
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions