summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-09-20 16:39:59 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-20 16:39:59 -0400
commitb85c715c2e6fabdd18c90df878ed2c6e6cd50fc2 (patch)
tree41f8cc32c03500c499e35e641f08f41a41f28ece /drivers/infiniband/ulp/ipoib/ipoib_vlan.c
parentaee77e4accbeb2c86b1d294cd84fec4a12dde3bd (diff)
parent450783747f42dfa3883920acfad4acdd93ce69af (diff)
downloadlinux-stable-b85c715c2e6fabdd18c90df878ed2c6e6cd50fc2.tar.gz
linux-stable-b85c715c2e6fabdd18c90df878ed2c6e6cd50fc2.tar.bz2
linux-stable-b85c715c2e6fabdd18c90df878ed2c6e6cd50fc2.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says: ==================== 1. Extension to PPS/PTP to allow for PHC devices where pulses are subject to a variable but measurable delay. 2. PPS/PTP/PHC support for Solarflare boards with a timestamping peripheral. 3. MTD support for updating the timestamping peripheral on those boards. 4. Fix for potential over-length requests to firmware. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_vlan.c')
0 files changed, 0 insertions, 0 deletions