diff options
author | 2011-11-15 14:45:50 -0200 | |
---|---|---|
committer | 2011-11-15 14:45:50 -0200 | |
commit | 80f01ca1fce2d5045b98f01989017767339b8700 (patch) | |
tree | 8899dbaa2949b8f2c6e83b65cd35669d9e85a462 /net/unix/af_unix.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin (diff) | |
parent | Merge branch 'for_3.2/gpio-cleanup' of git://gitorious.org/khilman/linux-omap-pm into gpio/merge (diff) | |
download | wireguard-linux-80f01ca1fce2d5045b98f01989017767339b8700.tar.xz wireguard-linux-80f01ca1fce2d5045b98f01989017767339b8700.zip |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
gpio: pca953x: propagate the errno from the chip_init functions
gpio: pca953x: remove unneeded check for chip type
gpio/omap: check return value from irq_alloc_generic_chip
gpio/omap: replace MOD_REG_BIT macro with static inline
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions