diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-29 11:03:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-29 11:03:27 -0700 |
| commit | 78a3cc38f72cb0e6938ed8e796041d6d1beb8a28 (patch) | |
| tree | 400bf76711d46155b78090371d96a2d8b6ed994e /include/sound/pcm_params.h | |
| parent | 49743170556e13156a64f8f20fa412805771b4e1 (diff) | |
| parent | 76462232c21dc011462522387ddad0598a4f11e4 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
arch/powerpc: use printk_ratelimited instead of printk_ratelimit
powerpc/rtas-rtc: remove sideeffects of printk_ratelimit
powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig
powerpc/e500: fix breakage with fsl_rio_mcheck_exception
powerpc/p1022ds: fix audio-related properties in the device tree
powerpc/85xx: fix NAND_CMD_READID read bytes number
Diffstat (limited to 'include/sound/pcm_params.h')
0 files changed, 0 insertions, 0 deletions