Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/net
History
David S. Miller 56845d78ce Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/atheros/atlx/atl1.c
	drivers/net/ethernet/atheros/atlx/atl1.h

Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-15 13:19:04 -04:00
..
9p net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
802 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
8021q vlan: Stop using NLA_PUT*(). 2012-04-02 04:33:44 -04:00
appletalk net: remove k{un}map_skb_frag() 2012-04-05 05:36:43 -04:00
atm net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ax25 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
batman-adv net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
bluetooth Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 2012-04-09 15:47:49 -04:00
bridge net: add generic PF_BRIDGE:RTM_ FDB hooks 2012-04-15 13:06:04 -04:00
caif net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
can can: remove references to berlios mailinglist 2011-10-17 19:22:46 -04:00
ceph net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
core net: rtnetlink notify events for FDB NTF_SELF adds and deletes 2012-04-15 13:06:04 -04:00
dcb net/dcb: Add an optional max rate attribute 2012-04-05 05:08:04 -04:00
dccp net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
decnet net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
dns_resolver net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
dsa dsa: Move switch drivers to new directory drivers/net/dsa 2011-11-29 00:21:36 -05:00
econet Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ethernet net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ieee802154 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ipv4 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
ipv6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-15 13:19:04 -04:00
ipx net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
irda net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
iucv Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2012-03-22 18:15:32 -07:00
key net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
l2tp net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
lapb Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
llc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
mac80211 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
netfilter net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
netlabel netlabel: use GFP flags from caller instead of GFP_ATOMIC 2012-03-22 19:29:57 -04:00
netlink Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-10 14:30:45 -04:00
netrom net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
nfc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
openvswitch net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
packet net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
phonet net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
rds RDS: use gfp flags from caller in conn_alloc() 2012-03-22 19:29:58 -04:00
rfkill device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
rose net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
rxrpc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
sched pkt_sched: Stop using NLA_PUT*(). 2012-04-01 18:11:37 -04:00
sctp net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
sunrpc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
tipc net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
unix net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
wanrouter wanrouter: Remove kernel_lock annotations 2011-11-07 13:27:30 -05:00
wimax net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
wireless net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
x25 net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
xfrm net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
compat.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
Kconfig net: Add Open vSwitch kernel components. 2011-12-03 09:35:17 -08:00
Makefile net: Add Open vSwitch kernel components. 2011-12-03 09:35:17 -08:00
nonet.c
socket.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
sysctl_net.c sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy 2012-01-24 16:40:30 -08:00