summaryrefslogtreecommitdiffstats
path: root/drivers/oprofile/oprofile_stats.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-10 17:39:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-10 17:39:01 -0700
commit9f381a61f58bb6487c93ce2233bb9992f8ea9211 (patch)
tree579baf2e2893ea97599db9da807ed334d11f11d5 /drivers/oprofile/oprofile_stats.h
parent21a43e397e7f66d3be44e09b54045f1a67838cc0 (diff)
parent9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (diff)
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) slcan: fix ldisc->open retval net/usb: mark LG VL600 LTE modem ethernet interface as WWAN xfrm: Don't allow esn with disabled anti replay detection xfrm: Assign the inner mode output function to the dst entry net: dev_close() should check IFF_UP vlan: fix GVRP at dismantle time netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0 netfilter: IPv6: fix DSCP mangle code netfilter: IPv6: initialize TOS field in REJECT target module IPVS: init and cleanup restructuring IPVS: Change of socket usage to enable name space exit. netfilter: ebtables: only call xt_compat_add_offset once per rule netfilter: fix ebtables compat support netfilter: ctnetlink: fix timestamp support for new conntracks pch_gbe: support ML7223 IOH PCH_GbE : Fixed the issue of checksum judgment PCH_GbE : Fixed the issue of collision detection NET: slip, fix ldisc->open retval be2net: Fixed bugs related to PVID. ehea: fix wrongly reported speed and port ...
Diffstat (limited to 'drivers/oprofile/oprofile_stats.h')
0 files changed, 0 insertions, 0 deletions