android_kernel_xiaomi_sm8350/net/ax25
David S. Miller df39e8ba56 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c
2008-04-14 02:30:23 -07:00
..
af_ax25.c [NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS. 2008-03-26 04:39:55 +09:00
ax25_addr.c
ax25_dev.c [AX25] ax25_ds_timer: use mod_timer instead of add_timer 2008-02-12 17:53:34 -08:00
ax25_ds_in.c Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
ax25_ds_subr.c Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
ax25_ds_timer.c [AX25] ax25_ds_timer: use mod_timer instead of add_timer 2008-02-12 17:53:34 -08:00
ax25_iface.c [AX25]: don't free pointers to statically allocated data 2007-08-14 17:24:05 -07:00
ax25_in.c [NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS. 2008-03-26 04:39:53 +09:00
ax25_ip.c [NET]: Move hardware header operations out of netdevice. 2007-10-10 16:52:52 -07:00
ax25_out.c [AX25] ax25_out: check skb for NULL in ax25_kick() 2008-02-17 22:31:19 -08:00
ax25_route.c [AX25] ax25_route: make ax25_route_lock BH safe 2008-02-12 17:53:32 -08:00
ax25_std_in.c
ax25_std_subr.c
ax25_std_timer.c [AX25]: sparse cleanups 2008-01-28 15:02:03 -08:00
ax25_subr.c [AX25]: Locking dependencies fix in ax25_disconnect(). 2007-12-16 14:02:07 -08:00
ax25_timer.c [AX25] ax25_timer: use mod_timer instead of add_timer 2008-02-12 17:53:33 -08:00
ax25_uid.c [AX25]: Potential ax25_uid_assoc-s leaks on module unload. 2008-04-12 18:33:50 -07:00
Kconfig [S390] Kconfig: unwanted menus for s390. 2007-05-10 15:46:07 +02:00
Makefile
sysctl_net_ax25.c [AX25]: Switch to using ctl_paths. 2008-01-28 15:01:09 -08:00
TODO [AX25]: Remove obsolete references to BKL from TODO file. 2008-03-26 02:14:38 -07:00