diff options
author | David S. Miller <davem@davemloft.net> | 2012-11-23 19:08:43 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-23 19:09:27 (GMT) |
commit | a386bff88575e206efbbad17190e591c8879f627 (patch) | |
tree | f332d652c6cfa560daf2c9016bfa642baae5cd64 /drivers/ata | |
parent | 2b9164771efe191c4ef266ae53c8c05ab92dd115 (diff) | |
parent | 94fc9c4719f53264c7cce62ee558781fee7b7128 (diff) | |
download | linux-fsl-qoriq-a386bff88575e206efbbad17190e591c8879f627.tar.xz |
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Paul Gortmaker says:
====================
The most interesting thing here, at least from a user perspective,
is the broadcast link fix -- where there was a corner case where
two endpoints could get in a state where they disagree on where
to start Rx and ack of broadcast packets.
There is also the poll/wait changes which could also impact
end users for certain use cases - the fixes there also better
align tipc with the rest of the networking code.
The rest largely falls into routine cleanup category, by getting
rid of some unused routines, some Kconfig clutter, etc.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions