diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 11:29:20 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 11:29:20 +0400 |
commit | 4c4d285ad5665bfbd983b95fde8d7a477d24a361 (patch) | |
tree | 05da51053d4c8943ae21ea0b152aef4c67eba19d /sound/oss/msnd_pinnacle.c | |
parent | 56c8bc3b7ed3d24c665e2ce992f86a5bedffc852 (diff) | |
parent | e64e1b11b14d363ac70fd13ab809969a6d7e42a8 (diff) | |
download | linux-4c4d285ad5665bfbd983b95fde8d7a477d24a361.tar.xz |
Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
SH/R-Mobile updates for 3.3 merge window.
* tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh: (32 commits)
arm: mach-shmobile: add a resource name for shdma
ARM: mach-shmobile: r8a7779 SMP support V3
ARM: mach-shmobile: Add kota2 defconfig.
ARM: mach-shmobile: Add marzen defconfig.
ARM: mach-shmobile: r8a7779 power domain support V2
ARM: mach-shmobile: Fix up marzen build for recent GIC changes.
ARM: mach-shmobile: r8a7779 PFC function support
ARM: mach-shmobile: Flush caches in platform_cpu_die()
ARM: mach-shmobile: Allow SoC specific CPU kill code
ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT
ARM: mach-shmobile: clock-r8a7779: clkz/clkzs support
ARM: mach-shmobile: clock-r8a7779: add DIV4 clock support
ARM: mach-shmobile: Marzen LAN89218 support
ARM: mach-shmobile: Marzen SCIF2/SCIF4 support
ARM: mach-shmobile: r8a7779 PFC GPIO-only support V2
ARM: mach-shmobile: r8a7779 and Marzen base support V2
sh: pfc: Unlock register support
sh: pfc: Variable bitfield width config register support
sh: pfc: Add config_reg_helper() function
sh: pfc: Convert index to field and value pair
...
Diffstat (limited to 'sound/oss/msnd_pinnacle.c')
0 files changed, 0 insertions, 0 deletions