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

2026-11-13 07:31:07 +00:00 · 2010-12-03 03:52:43 +00:00 · 2010-12-03 03:52:43 +00:00 · ebb27386ff
commit ebb27386ff
parent 6d20e8406f 59e57c622c
83 changed files with 763 additions and 501 deletions
--- a/Documentation/driver-model/interface.txt
+++ b/Documentation/driver-model/interface.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/5
+++ b/5
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/drivers/gpio/cs5535-gpio.c
+++ b/drivers/gpio/cs5535-gpio.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-egalax.c
+++ b/drivers/hid/hid-egalax.c
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
--- a/drivers/infiniband/core/ud_header.c
+++ b/drivers/infiniband/core/ud_header.c
--- a/drivers/infiniband/core/uverbs_marshall.c
+++ b/drivers/infiniband/core/uverbs_marshall.c
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
--- a/drivers/serial/mfd.c
+++ b/drivers/serial/mfd.c
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
--- a/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
--- a/drivers/staging/batman-adv/soft-interface.c
+++ b/drivers/staging/batman-adv/soft-interface.c
--- a/drivers/staging/brcm80211/README
+++ b/drivers/staging/brcm80211/README
--- a/drivers/staging/brcm80211/TODO
+++ b/drivers/staging/brcm80211/TODO
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
--- a/drivers/staging/easycap/easycap.h
+++ b/drivers/staging/easycap/easycap.h
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
--- a/drivers/staging/intel_sst/intel_sst_stream_encoded.c
+++ b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
--- a/drivers/staging/line6/control.c
+++ b/drivers/staging/line6/control.c
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
--- a/drivers/staging/line6/pod.c
+++ b/drivers/staging/line6/pod.c
--- a/drivers/staging/line6/toneport.c
+++ b/drivers/staging/line6/toneport.c
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
--- a/drivers/staging/quickstart/quickstart.c
+++ b/drivers/staging/quickstart/quickstart.c
--- a/drivers/staging/rt2860/usb_main_dev.c
+++ b/drivers/staging/rt2860/usb_main_dev.c
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
--- a/drivers/staging/rtl8712/usb_halinit.c
+++ b/drivers/staging/rtl8712/usb_halinit.c
--- a/drivers/staging/samsung-laptop/samsung-laptop.c
+++ b/drivers/staging/samsung-laptop/samsung-laptop.c
--- a/drivers/staging/speakup/fakekey.c
+++ b/drivers/staging/speakup/fakekey.c
--- a/drivers/staging/spectra/ffsport.c
+++ b/drivers/staging/spectra/ffsport.c
--- a/drivers/staging/udlfb/udlfb.c
+++ b/drivers/staging/udlfb/udlfb.c
--- a/drivers/staging/winbond/sysdef.h
+++ b/drivers/staging/winbond/sysdef.h
--- a/drivers/staging/zram/zram_sysfs.c
+++ b/drivers/staging/zram/zram_sysfs.c
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
--- a/drivers/uio/uio_netx.c
+++ b/drivers/uio/uio_netx.c
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
--- a/include/linux/node.h
+++ b/include/linux/node.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
--- a/mm/ksm.c
+++ b/mm/ksm.c
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig