linux/net/ieee802154
David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/e1000e/param.c
	drivers/net/wireless/iwlwifi/iwl-agn-rx.c
	drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
	drivers/net/wireless/iwlwifi/iwl-trans.h

Resolved the iwlwifi conflict with mainline using 3-way diff posted
by John Linville and Stephen Rothwell.  In 'net' we added a bug
fix to make iwlwifi report a more accurate skb->truesize but this
conflicted with RX path changes that happened meanwhile in net-next.

In e1000e a conflict arose in the validation code for settings of
adapter->itr.  'net-next' had more sophisticated logic so that
logic was used.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-07 23:35:40 -04:00
..
6lowpan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-05-07 23:35:40 -04:00
6lowpan.h 6lowpan: duplicate definition of IEEE802154_ALEN 2012-04-26 06:01:09 -04:00
Kconfig IEEE802.15.4: 6LoWPAN basic support 2011-08-24 19:36:06 -07:00
Makefile IEEE802.15.4: 6LoWPAN basic support 2011-08-24 19:36:06 -07:00
af802154.h
af_ieee802154.c ieee802154: free skb buffer if dev isn't running 2011-06-30 16:18:09 +04:00
dgram.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ieee802154.h
netlink.c
nl-mac.c ieee802154: Stop using NLA_PUT*(). 2012-04-02 04:33:43 -04:00
nl-phy.c ieee802154: Stop using NLA_PUT*(). 2012-04-02 04:33:43 -04:00
nl_policy.c
raw.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
wpan-class.c ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc 2010-05-23 23:11:07 -07:00