| commit | 076ce4482569ea1a2c27b4ca71a309adaf91d398 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Nov 14 01:01:12 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Nov 14 01:01:12 2014 -0500 |
| tree | 2ae9e42612f35be897f190983fc292d7af781cd2 | |
| parent | d649a7a81f3b5bacb1d60abd7529894d8234a666 [diff] | |
| parent | b23dc5a7cc6ebc9a0d57351da7a0e8454c9ffea3 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>