sjur.brandeland@stericsson.com
63afe12f4b
if_ether.h: Add IEEE 802.1 Local Experimental Ethertype 1. ...
Add EthType 0x88b5.
This Ethertype value is available for public use for prototype and
vendor-specific protocol development,as defined in Amendment 802a
to IEEE Std 802.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-12-05 18:27:56 -05:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2011-11-07 10:13:52 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
2011-11-22 14:05:46 -05:00
Merge branch 'exynos-drm' of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes
2011-11-28 14:17:09 +00:00
if_ether.h: Add IEEE 802.1 Local Experimental Ethertype 1.
2011-12-05 18:27:56 -05:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.
2011-12-05 15:20:19 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-11-01 10:51:38 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2011-11-06 19:00:42 -08:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
ARM: OMAP: HWMOD: Unify DSS resets for OMAPs
2011-11-08 03:16:13 -07:00
xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI
2011-11-16 12:13:42 -05:00
63afe12f4b