Merge branch 'core/resources' into x86/core

2026-09-18 18:15:59 +00:00 · 2008-09-04 21:04:04 +02:00 · 2008-09-04 21:04:04 +02:00 · 8040d77688
commit 8040d77688
parent fb481dd56a 268364a0f4
48 changed files with 356 additions and 240 deletions
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
--- a/arch/powerpc/kernel/idle_6xx.S
+++ b/arch/powerpc/kernel/idle_6xx.S
--- a/arch/powerpc/kernel/idle_e500.S
+++ b/arch/powerpc/kernel/idle_e500.S
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
--- a/kernel/resource.c
+++ b/kernel/resource.c
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
--- a/net/tipc/cluster.c
+++ b/net/tipc/cluster.c
--- a/net/tipc/cluster.h
+++ b/net/tipc/cluster.h
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
--- a/net/tipc/name_table.h
+++ b/net/tipc/name_table.h
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
--- a/net/tipc/node_subscr.c
+++ b/net/tipc/node_subscr.c
--- a/net/tipc/node_subscr.h
+++ b/net/tipc/node_subscr.h
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
--- a/net/tipc/zone.c
+++ b/net/tipc/zone.c
--- a/net/tipc/zone.h
+++ b/net/tipc/zone.h
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c