git.monstr.eu Git - linux-2.6-microblaze.git/commit

author	David S. Miller <davem@davemloft.net>
	Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500)
commit	67f4efdce7d85282fbd5832cddc80a07eb89b6d6
tree	9a1771ef13b27abdf8cf172e5b7556ab93e5c48c	tree
parent	c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584	commit \| diff
parent	f4a75d2eb7b1e2206094b901be09adb31ba63681	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Minor line offset auto-merges.

Signed-off-by: David S. Miller <davem@davemloft.net>

26 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ksz884x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ncm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/smsc95xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/translation-table.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/smp.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ipv6_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ksz884x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ncm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/smsc95xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/translation-table.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/smp.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ipv6_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history