diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 10:19:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 10:19:49 +0200 |
| commit | ca4da6948bc6a7010ecf916dad528c177dcb9a81 (patch) | |
| tree | dfc17d206fdeccb4ee532a19e5ee95161ed5ef77 /drivers/power/da9030_battery.c | |
| parent | Merge branch 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers (diff) | |
| parent | Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next (diff) | |
| download | linux-ca4da6948bc6a7010ecf916dad528c177dcb9a81.tar.xz linux-ca4da6948bc6a7010ecf916dad528c177dcb9a81.zip | |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull infiniband changes from Roland Dreier:
"Second batch of changes for the 3.7 merge window:
- Late-breaking fix for IPoIB on mlx4 SR-IOV VFs.
- Fix for IPoIB build breakage with CONFIG_INFINIBAND_IPOIB_CM=n (new
netlink config changes are to blame).
- Make sure retry count values are in range in RDMA CM.
- A few nes hardware driver fixes and cleanups.
- Have iSER initiator use >1 interrupt vectors if available."
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/cma: Check that retry count values are in range
IB/iser: Add more RX CQs to scale out processing of SCSI responses
RDMA/nes: Bump the version number of nes driver
RDMA/nes: Remove unused module parameter "send_first"
RDMA/nes: Remove unnecessary if-else statement
RDMA/nes: Add missing break to switch.
mlx4_core: Adjust flow steering attach wrapper so that IB works on SR-IOV VFs
IPoIB: Fix build with CONFIG_INFINIBAND_IPOIB_CM=n
Diffstat (limited to 'drivers/power/da9030_battery.c')
0 files changed, 0 insertions, 0 deletions