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)
commite65ac4d54546b7d7514a9e8be1484c758f2b7ba3
tree7b4bffabbe75739310e200360789e25732540da0
parent816a7854d56f19aeba3c83e1ed8c2c0ef275365a
parentd62f8dbb5b7771910f7c4657345df8ac93acb832
Merge git://git./linux/kernel/git/davem/net

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>
net/caif/chnl_net.c