Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts: kernel/trace/trace_mmiotrace.c
2026-10-16 22:39:48 +00:00 · 2009-02-15 20:08:55 +01:00 · 2009-02-15 20:08:55 +01:00 · 9abd603048
commit 9abd603048
parent 5fb896a4e9 f9aa28adfc
41 changed files with 8881 additions and 8997 deletions
--- a/Documentation/connector/cn_test.c
+++ b/Documentation/connector/cn_test.c
--- a/2
+++ b/2
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
--- a/drivers/net/bnx2_fw.h
+++ b/drivers/net/bnx2_fw.h
--- a/drivers/net/bnx2_fw2.h
+++ b/drivers/net/bnx2_fw2.h
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
--- a/include/linux/soundcard.h
+++ b/include/linux/soundcard.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/kernel/user.c
+++ b/kernel/user.c
--- a/net/core/sock.c
+++ b/net/core/sock.c
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
--- a/net/wimax/id-table.c
+++ b/net/wimax/id-table.c
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c