armbian/linux
0
0
Fork 0
mirror of https://github.com/armbian/linux.git synced 2026-01-06 10:13:00 -08:00
Code Issues Packages Projects Releases Wiki Activity
Files
3ed00a8562848a557239e84aac3ddf5bbecd7073
linux/net
History
黄涛 8aac13f440 Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0 
Conflicts:
	drivers/mmc/card/block.c
	drivers/net/usb/asix.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath9k/ar9002_calib.c
	drivers/net/wireless/ath/ath9k/ar9002_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	drivers/net/wireless/ath/ath9k/ar9003_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_phy.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/init.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/hostap/hostap_main.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-power.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00mac.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h
	drivers/net/wireless/rt2x00/rt2x00usb.c
	drivers/usb/serial/option.c
2011-11-09 13:06:28 +08:00
..
9p
net/9p: Fix kernel crash with msize 512K
2011-10-03 11:40:22 -07:00
802
snap: remove one synchronize_net()
2011-05-23 16:29:24 -04:00
8021q
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
appletalk
…
atm
atm: br2684: Fix oops due to skb->dev being NULL
2011-10-03 11:39:57 -07:00
ax25
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
bluetooth
Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0
2011-11-09 13:06:28 +08:00
bridge
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
caif
caif: Bugfix - XOFF removed channel from caif-mux
2011-06-16 23:59:09 -04:00
can
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
ceph
ceph: fix file mode calculation
2011-07-19 11:25:04 -07:00
core
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
dcb
…
dccp
net: Compute protocol sequence numbers and fragment IDs using MD5.
2011-08-15 18:31:35 -07:00
decnet
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
dns_resolver
…
dsa
…
econet
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
ethernet
net: add IFF_SKB_TX_SHARED flag to priv_flags
2011-08-15 18:31:38 -07:00
ieee802154
ieee802154: Don't leak memory in ieee802154_nl_fill_phy
2011-06-13 18:03:22 -04:00
ipv4
tcp: Don't nuke connections for the wrong protocol
2011-11-03 17:08:47 -07:00
ipv6
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
ipx
…
irda
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
iucv
[S390] irq: merge irq.c and s390_ext.c
2011-05-26 09:48:24 +02:00
key
net: convert %p usage to %pK
2011-05-24 01:13:12 -04:00
l2tp
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
lapb
…
llc
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
mac80211
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
netfilter
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
netlabel
Remove prefetch() from <linux/skbuff.h> and "netlabel_addrlist.h"
2011-05-22 21:43:41 -07:00
netlink
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
netrom
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
packet
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
phonet
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
rds
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
rfkill
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
rose
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
rxrpc
rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
2011-05-19 18:51:50 -04:00
sched
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
sctp
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
sunrpc
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
tipc
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
unix
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
wanrouter
…
wimax
…
wireless
net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
2011-10-28 10:35:37 -07:00
x25
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
xfrm
xfrm: Perform a replay check after return from async codepaths
2011-10-03 11:40:55 -07:00
activity_stats.c
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
compat.c
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
Kconfig
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
Makefile
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
nonet.c
…
socket.c
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
sysctl_net.c
…
TUNABLE
…