diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-24 03:24:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-24 03:24:10 +0200 |
| commit | 514e250f67d2b2a8ab08dc9c3650af19a411c926 (patch) | |
| tree | 5cb431c3a7c4792358ee82798281976db0412786 /net/ipv4/tcp.c | |
| parent | Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | gpio: Don't override the error code in probe error handling (diff) | |
| download | linux-514e250f67d2b2a8ab08dc9c3650af19a411c926.tar.xz linux-514e250f67d2b2a8ab08dc9c3650af19a411c926.zip | |
Merge tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij:
- An OMAP fix that makes ethernet work again.
- Fix for build problem when building the MCP23S08 driver as module.
- IRQ conflicts in the Langwell driver.
- Fix IRQ coherency issues in the MXS driver.
- Return correct errorcode on errorpath when removing GPIO chips.
* tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio: Don't override the error code in probe error handling
gpio: mxs: Use set and clear capabilities of the gpio controller
gpio-langwell: fix irq conflicts when DT is not used
gpio: mcp23s08: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
gpio/omap: ensure gpio context is initialised
Diffstat (limited to 'net/ipv4/tcp.c')
0 files changed, 0 insertions, 0 deletions