From: David S. Miller Date: Tue, 17 Jul 2012 06:04:00 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: v3.6-rc1~125^2~153 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ff65cdea72bdf9af0b9c57cd003211875ca4142;p=platform%2Fkernel%2Flinux-3.10.git Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next Jett Kirsher says: ==================== This series contains updates to e1000e and ixgbe. ... Alexander Duyck (5): ixgbe: Simplify logic for getting traffic class from user priority ixgbe: Cleanup unpacking code for DCB ixgbe: Populate the prio_tc_map in ixgbe_setup_tc ixgbe: Add function for obtaining FCoE TC based on FCoE user priority ixgbe: Merge FCoE set_num and cache_ring calls into RSS/DCB config ==================== Signed-off-by: David S. Miller --- 7ff65cdea72bdf9af0b9c57cd003211875ca4142