summaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel/pm-mb93093.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-07 01:15:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-07 01:15:10 +0200
commit3ee72ca99288f1de95ec9c570e43f531c8799f06 (patch)
tree1199d129cb94b128eb6029d5fcc3ff0d4900b067 /arch/frv/kernel/pm-mb93093.c
parentx86/PCI: use host bridge _CRS info on ASUS M2V-MX SE (diff)
parentnet: fix typos in Documentation/networking/scaling.txt (diff)
downloadlinux-3ee72ca99288f1de95ec9c570e43f531c8799f06.tar.xz
linux-3ee72ca99288f1de95ec9c570e43f531c8799f06.zip
Merge git://github.com/davem330/net
* git://github.com/davem330/net: net: fix typos in Documentation/networking/scaling.txt bridge: leave carrier on for empty bridge netfilter: Use proper rwlock init function tcp: properly update lost_cnt_hint during shifting tcp: properly handle md5sig_pool references macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
Diffstat (limited to 'arch/frv/kernel/pm-mb93093.c')
0 files changed, 0 insertions, 0 deletions