litmus-rt.git - The LITMUS^RT kernel.

	Commit message (Collapse)	Author	Age
*	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	David S. Miller	2013-04-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>
*	Merge branch 'master' of ↵	John W. Linville	2013-04-29
\| \| \| \|	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
*	NFC: Move LLCP code to the NFC top level diirectory	Samuel Ortiz	2013-04-26
	And stop making it optional. LLCP is a fundamental part of the NFC specifications and making it optional does not make much sense. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>