Merge branch 'master' into next

2026-11-13 07:31:07 +00:00 · 2009-09-30 07:47:33 +10:00 · 2009-09-30 07:47:33 +10:00 · 1669b049db
commit 1669b049db
parent 7f366784f5 17d857be64
8373 changed files with 916881 additions and 470679 deletions
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
--- a/drivers/char/bfin-otp.c
+++ b/drivers/char/bfin-otp.c
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
--- a/drivers/char/generic_nvram.c
+++ b/drivers/char/generic_nvram.c
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
--- a/drivers/char/hvc_console.h
+++ b/drivers/char/hvc_console.h
--- a/drivers/char/hvc_iucv.c
+++ b/drivers/char/hvc_iucv.c
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
--- a/drivers/char/hw_random/octeon-rng.c
+++ b/drivers/char/hw_random/octeon-rng.c
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
--- a/drivers/char/tty_ldisc.c
+++ b/drivers/char/tty_ldisc.c
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
--- a/drivers/char/uv_mmtimer.c
+++ b/drivers/char/uv_mmtimer.c
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c