summaryrefslogtreecommitdiff
path: root/drivers/sn
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-11-21 22:50:33 +0400
committerDavid S. Miller <davem@davemloft.net>2011-11-21 22:50:33 +0400
commitefd0bf97deeddd9ba53daabfc470a1399c6b0b2d (patch)
treeeec56da5fbc796bac7c67f1990a18f5e0a304059 /drivers/sn
parentf8a15af093b19b86d56933c8757cee298d0f32a8 (diff)
parent6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82 (diff)
downloadlinux-efd0bf97deeddd9ba53daabfc470a1399c6b0b2d.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over to atomic u64 statistics in net-next. The libertas cfg.c code had a conflict with the bss reference counting fix by John Linville in net-next. Conflicts: drivers/net/ethernet/nvidia/forcedeth.c drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'drivers/sn')
0 files changed, 0 insertions, 0 deletions