Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-28 19:20:30 +00:00 · 2009-03-06 17:06:44 -06:00 · 2009-03-06 17:06:44 -06:00 · 47d1ff6e1a
commit 47d1ff6e1a
parent b79631330a 559595a985
36 changed files with 322 additions and 118 deletions
--- a/2
+++ b/2
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
--- a/arch/arm/plat-s3c64xx/irq-eint.c
+++ b/arch/arm/plat-s3c64xx/irq-eint.c
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
--- a/arch/x86/mm/testmmiotrace.c
+++ b/arch/x86/mm/testmmiotrace.c
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
--- a/crypto/api.c
+++ b/crypto/api.c
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/rcupreempt.h
+++ b/include/linux/rcupreempt.h
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/init/main.c
+++ b/init/main.c
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sys.c
+++ b/kernel/sys.c
--- a/kernel/user.c
+++ b/kernel/user.c