diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 01:51:35 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 01:51:35 (GMT) |
| commit | e9d728f528f9548c8dd013899b23e662fa7b6bca (patch) | |
| tree | d88a5df6e5a2b33ebe088ad0223fe54679a59df3 /sound/oss/sound_timer.c | |
| parent | 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1 (diff) | |
| parent | 6155f77d09b968f591876f368d4843168910449e (diff) | |
| download | linux-e9d728f528f9548c8dd013899b23e662fa7b6bca.tar.xz | |
Merge branch 'rmobile/smp' into rmobile-latest
Conflicts:
arch/arm/Kconfig
arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound/oss/sound_timer.c')
0 files changed, 0 insertions, 0 deletions