Files
linux/arch/powerpc/include/asm
David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-06 22:34:15 -04:00
..
2014-08-14 12:48:11 +02:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2015-01-23 14:02:50 +11:00
2013-04-18 13:03:53 +10:00
2014-11-17 17:55:11 +11:00
2014-04-09 12:53:28 +10:00
2012-03-28 18:30:02 +01:00
2014-01-23 16:36:54 -08:00
2011-11-08 14:51:46 +11:00
2014-06-25 18:49:40 -05:00
2015-01-12 05:04:13 -08:00
2015-02-03 18:47:18 +01:00
2014-11-03 12:12:32 +11:00
2012-03-20 21:48:30 +08:00
2015-02-23 14:52:04 +11:00
2011-07-26 16:49:47 -07:00
2013-12-09 11:40:25 +11:00
2014-07-28 14:10:23 +10:00
2014-11-07 18:10:42 -06:00
2014-07-28 14:10:23 +10:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2014-06-26 13:19:42 +02:00
2013-11-06 14:13:49 +11:00
2014-11-10 09:59:25 +11:00
2015-01-28 15:00:24 +11:00
2012-09-17 16:31:51 +10:00
2011-03-31 11:26:23 -03:00
2014-06-24 12:43:15 +10:00
2014-07-11 16:06:08 +10:00
2011-03-31 11:26:23 -03:00
2014-02-17 11:19:37 +11:00
2014-11-03 12:12:32 +11:00
2013-10-30 16:02:28 +11:00