diff options
author | 2011-02-22 17:13:16 -0800 | |
---|---|---|
committer | 2011-02-22 17:13:16 -0800 | |
commit | 4a508dd259f5995b8d31c576b894263f5947d654 (patch) | |
tree | 8a08cb56d3b7781dd056f04e8a225af4e7e63220 /net/unix/af_unix.c | |
parent | Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
parent | i2c-omap: fixup commit cb527ede1bf6ff2008a025606f25344b8ed7b4ac whitespace (diff) | |
download | wireguard-linux-4a508dd259f5995b8d31c576b894263f5947d654.tar.xz wireguard-linux-4a508dd259f5995b8d31c576b894263f5947d654.zip |
Merge branch 'for-2639-rc4/i2c-fixes' of git://git.fluff.org/bjdooks/linux
* 'for-2639-rc4/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
i2c-omap: fixup commit cb527ede1bf6ff2008a025606f25344b8ed7b4ac whitespace
i2c-omap: Double clear of ARDY status in IRQ handler
i2c-omap: fix build for !CONFIG_SUSPEND
i2c-omap: fix static suspend vs. runtime suspend
i2c-stu300: make sure adapter-name is terminated
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions