projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 816a785 d62f8db)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 13 Apr 2012 15:30:55 +0000 (11:30 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Apr 2012 15:36:48 +0000 (11:36 -0400)
Pull in the 'net' tree to get CAIF bug fixes upon which
the following set of CAIF feature patches depend.

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
net/caif/chnl_net.c patch | diff1 | diff2 | blob | history

diff --cc net/caif/chnl_net.c
Simple merge
John Crispins staging tree