summaryrefslogtreecommitdiff
path: root/sound/drivers/mts64.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-10 08:10:44 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-11-10 08:10:44 (GMT)
commita5a64498c194c82ecad3a2d67cff6231cda8d3dd (patch)
tree723d5d81419f9960b8d30ed9a2ece8a58d6c4328 /sound/drivers/mts64.c
parentbb93d802ae5c1949977cc6da247b218240677f11 (diff)
parentf7160c7573615ec82c691e294cf80d920b5d588d (diff)
downloadlinux-a5a64498c194c82ecad3a2d67cff6231cda8d3dd.tar.xz
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts: drivers/rtc/rtc-cmos.c
Diffstat (limited to 'sound/drivers/mts64.c')
0 files changed, 0 insertions, 0 deletions