summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/ross.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-21 02:23:03 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-21 02:23:03 +0200
commite616c6303306df62223ebe2e68bb2f19c420dd81 (patch)
treed60d372fac5ceb4da71ac3802422b9b0ae52b20d /include/asm-sparc/ross.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentpktgen: make sure that pktgen_thread_worker has been executed (diff)
downloadlinux-e616c6303306df62223ebe2e68bb2f19c420dd81.tar.xz
linux-e616c6303306df62223ebe2e68bb2f19c420dd81.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits) pktgen: make sure that pktgen_thread_worker has been executed [VLAN]: Propagate selected feature bits to VLAN devices drivers/atm/: remove CVS keywords vlan: Correctly handle device notifications for layered VLAN devices net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags() net_sched: cls_api: fix return value for non-existant classifiers ipsec: Use the correct ip_local_out function ipv6 addrconf: Allow infinite prefix lifetime. ipv6 route: Fix lifetime in netlink. ipv6 addrconf: Fix route lifetime setting in corner case. ndisc: Add missing strategies for per-device retrans timer/reachable time settings. ipv6: Move <linux/in6.h> from header-y to unifdef-y. l2tp: avoid skb truesize bug if headroom is increased wireless: Create 'device' symlink in sysfs wireless, airo: waitbusy() won't delay libertas: fix command timeout after firmware failure mac80211: Add RTNL version of ieee80211_iterate_active_interfaces mac80211 : Association with 11n hidden ssid ap. hostap: fix "registers" registration in procfs isdn/capi: Return proper errnos on module init. ...
Diffstat (limited to 'include/asm-sparc/ross.h')
0 files changed, 0 insertions, 0 deletions