diff options
| author | Linus Torvalds | 2012-11-09 06:59:04 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-11-09 06:59:04 +0100 |
| commit | a186d25de39ba2e3c6a3ef1c3975dabb29fe7421 (patch) | |
| tree | 28490fcecc2ead32f53d3f5cdc3c01844832eeaf /sound/usb/proc.c | |
| parent | 4ad48bb72cfaecd10f70b3a56deb12cb0f7c0b02 (diff) | |
| parent | 924da31416f20a8ee7a9008dd4e6e6054bc36b1b (diff) | |
Merge tag 'pinctrl-for-v3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fixes from Linus Walleij:
- A set of SPEAr pinctrl fixes that recently arrived
- A fixup for the Samsung/Exynos Kconfig deps
* tag 'pinctrl-for-v3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: samsung and exynos need to depend on OF && GPIOLIB
pinctrl: SPEAr1340: Add clcd sleep mode pin configuration
pinctrl: SPEAr1340: Make DDR reset & clock pads as gpio
pinctrl: SPEAr1310: add register entries for enabling pad direction
pinctrl: SPEAr1310: Separate out pci pins from pcie_sata pin group
pinctrl: SPEAr1310: Fix value of PERIP_CFG reigster and MCIF_SEL_SHIFT
pinctrl: SPEAr1310: fix clcd high resolution pin group name
pinctrl: SPEAr320: Correct pad mux entries for rmii/smii
pinctrl: SPEAr3xx: correct register space to configure pwm
pinctrl: SPEAr: Don't update all non muxreg bits on pinctrl_disable
Diffstat (limited to 'sound/usb/proc.c')
0 files changed, 0 insertions, 0 deletions