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

2026-09-28 19:20:30 +00:00 · 2009-04-20 19:59:09 +00:00 · 2009-04-20 19:59:09 +00:00 · cbb7fe129b
commit cbb7fe129b
parent 7b0c8fcff4 a939b96ccc
43 changed files with 259 additions and 120 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
--- a/Documentation/lguest/.gitignore
+++ b/Documentation/lguest/.gitignore
--- a/Documentation/lguest/lguest.txt
+++ b/Documentation/lguest/lguest.txt
--- a/22
+++ b/22
--- a/2
+++ b/2
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
--- a/arch/x86/include/asm/lguest_hcall.h
+++ b/arch/x86/include/asm/lguest_hcall.h
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
--- a/drivers/gpu/drm/via/via_dma.c
+++ b/drivers/gpu/drm/via/via_dma.c
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
--- a/drivers/lguest/segments.c
+++ b/drivers/lguest/segments.c
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
--- a/fs/namespace.c
+++ b/fs/namespace.c
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
--- a/lib/kobject.c
+++ b/lib/kobject.c
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
--- a/sound/soc/s3c24xx/jive_wm8750.c
+++ b/sound/soc/s3c24xx/jive_wm8750.c
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c