git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0f64726 bef5c87)

author	David S. Miller <davem@davemloft.net>
	Sun, 21 Aug 2011 00:25:36 +0000 (17:25 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sun, 21 Aug 2011 00:25:36 +0000 (17:25 -0700)
commit	1d05772c2a6b569761a1f5dd680cfac797fd16fa
tree	84010e15b506f0506c15dbf03794dd8b776074ea	tree \| snapshot
parent	0f647262d9d5f3cff867121cb080e67b1f9bbaab	commit \| diff
parent	bef5c87631edbd0cae743857baf5d7c68b9b295c	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next

Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c

Linux Kernel Source Tree.