diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 00:36:53 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 00:36:53 (GMT) |
| commit | e81218f5f0fd219bd75768d845159ba4810bdd48 (patch) | |
| tree | 0694d25e9601dab913644ed8a1a7734387e08e7c /net/socket.c | |
| parent | 3645f0cd96fbf72c614673c5f4b1a8675f82a379 (diff) | |
| parent | 8ee41a62a3800b8450985d2970fd985421ad7043 (diff) | |
| download | linux-fsl-qoriq-e81218f5f0fd219bd75768d845159ba4810bdd48.tar.xz | |
Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc pincontrol drivers update from Arnd Bergmann:
"We are converting platforms to use the pinctrl framework over time,
rather than using platform specific code for the same effect. This
adds the respective driver for the prima2 platform."
* tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: prima2: enable gpiolib unconditionally
PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions