diff options
Diffstat (limited to 'Next/merge.log')
-rw-r--r-- | Next/merge.log | 913 |
1 files changed, 913 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..1281de385d5a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,913 @@ +HEAD is now at 9a4c854... Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 +Merging origin/master +Updating 9a4c854..00e962c +Fast forward + Documentation/networking/tcp.txt | 8 +- + arch/s390/Kconfig | 3 +- + arch/s390/kernel/process.c | 15 +- + arch/s390/kernel/smp.c | 53 ++- + arch/s390/kernel/time.c | 2 - + arch/s390/lib/uaccess_std.c | 8 +- + arch/sparc/kernel/process.c | 6 - + arch/sparc/kernel/setup.c | 4 - + arch/sparc/mm/sun4c.c | 4 +- + arch/sparc/prom/misc.c | 7 - + arch/sparc64/Kconfig.debug | 4 - + arch/sparc64/Makefile | 36 +- + arch/sparc64/defconfig | 33 +- + arch/sparc64/kernel/iommu.c | 3 +- + arch/sparc64/kernel/pci.c | 21 - + arch/sparc64/kernel/process.c | 15 - + arch/sparc64/kernel/prom.c | 1 - + arch/sparc64/kernel/setup.c | 29 +- + arch/sparc64/kernel/sparc64_ksyms.c | 3 - + arch/sparc64/kernel/unaligned.c | 3 +- + arch/sparc64/mm/init.c | 49 +-- + arch/sparc64/prom/misc.c | 9 - + block/blk-core.c | 4 +- + block/blk-ioc.c | 37 +- + block/blk-map.c | 20 + + block/blk-merge.c | 6 +- + block/blk-settings.c | 9 +- + block/bsg.c | 8 +- + block/cfq-iosched.c | 38 +- + block/elevator.c | 15 + + block/scsi_ioctl.c | 3 +- + drivers/ata/ahci.c | 5 - + drivers/ata/libata-core.c | 249 +------- + drivers/ata/libata-scsi.c | 72 ++- + drivers/ata/pata_icside.c | 8 - + drivers/ata/sata_fsl.c | 13 - + drivers/ata/sata_mv.c | 6 +- + drivers/ata/sata_sil24.c | 5 - + drivers/net/e1000/e1000_ethtool.c | 2 +- + drivers/net/e1000/e1000_main.c | 8 + + drivers/net/e1000e/netdev.c | 34 +- + drivers/net/gianfar.c | 4 +- + drivers/net/gianfar_mii.c | 4 +- + drivers/net/hamradio/mkiss.c | 5 +- + drivers/net/igb/igb_ethtool.c | 2 +- + drivers/net/igb/igb_main.c | 28 - + drivers/net/ixgb/ixgb_ethtool.c | 2 +- + drivers/net/ixgbe/ixgbe_main.c | 41 +- + drivers/net/niu.c | 11 +- + drivers/net/pcmcia/smc91c92_cs.c | 12 +- + drivers/net/tsi108_eth.c | 72 ++- + drivers/net/wireless/ath5k/base.c | 4 +- + drivers/net/wireless/ath5k/hw.c | 34 +- + drivers/net/wireless/b43/b43.h | 6 + + drivers/net/wireless/b43/main.c | 40 +- + drivers/net/wireless/b43legacy/b43legacy.h | 4 + + drivers/net/wireless/b43legacy/dma.c | 167 +++-- + drivers/net/wireless/b43legacy/dma.h | 33 +- + drivers/net/wireless/b43legacy/main.c | 41 +- + drivers/net/wireless/ipw2200.c | 45 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 19 +- + drivers/net/wireless/iwlwifi/iwl4965-base.c | 17 +- + drivers/net/wireless/rndis_wlan.c | 14 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 2 +- + drivers/net/wireless/wavelan.h | 6 +- + drivers/s390/block/dasd.c | 12 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/char/sclp.c | 12 +- + drivers/s390/char/sclp.h | 6 +- + drivers/s390/char/sclp_config.c | 2 +- + drivers/s390/char/sclp_cpi_sys.c | 2 +- + drivers/s390/char/sclp_rw.c | 4 +- + drivers/s390/char/sclp_vt220.c | 2 +- + drivers/s390/cio/device.c | 15 +- + drivers/s390/cio/qdio.c | 13 +- + drivers/s390/cio/qdio.h | 2 +- + drivers/scsi/ipr.c | 4 +- + drivers/scsi/libsas/sas_ata.c | 4 +- + drivers/scsi/scsi_lib.c | 8 +- + drivers/video/aty/atyfb_base.c | 64 -- + drivers/video/cg14.c | 1 + + drivers/video/sbuslib.c | 1 + + drivers/watchdog/Kconfig | 25 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/bfin_wdt.c | 7 +- + drivers/watchdog/hpwdt.c | 926 +++++++++++++++++++++++++++ + drivers/watchdog/mtx-1_wdt.c | 35 +- + drivers/watchdog/sb_wdog.c | 353 ++++++++++ + fs/bio.c | 2 +- + fs/block_dev.c | 201 +------ + include/asm-s390/bitops.h | 20 +- + include/asm-sparc64/ptrace.h | 1 + + include/linux/aio.h | 1 - + include/linux/bio.h | 1 - + include/linux/blkdev.h | 8 +- + include/linux/fs.h | 1 - + include/linux/if_ether.h | 3 +- + include/linux/iocontext.h | 2 + + include/linux/libata.h | 28 +- + include/linux/skbuff.h | 2 + + include/net/sock.h | 1 + + kernel/irq/chip.c | 20 +- + kernel/irq/spurious.c | 3 +- + mm/slub.c | 87 +--- + net/8021q/vlan_dev.c | 10 +- + net/9p/trans_virtio.c | 3 +- + net/ax25/ax25_out.c | 13 +- + net/bluetooth/hci_conn.c | 1 - + net/bluetooth/hci_core.c | 5 +- + net/bluetooth/hci_sysfs.c | 24 +- + net/core/neighbour.c | 12 +- + net/core/rtnetlink.c | 36 +- + net/ipv4/arp.c | 3 + + net/ipv4/ipconfig.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/af_inet6.c | 8 - + net/ipv6/ip6_fib.c | 2 +- + net/ipv6/ip6_tunnel.c | 1 + + net/mac80211/ieee80211.c | 5 +- + net/netlabel/netlabel_cipso_v4.c | 45 +- + net/netlabel/netlabel_domainhash.c | 2 +- + net/netlabel/netlabel_mgmt.c | 81 +-- + net/netlabel/netlabel_unlabeled.c | 92 +-- + net/netlabel/netlabel_user.c | 2 +- + net/rxrpc/ar-accept.c | 3 +- + net/rxrpc/ar-ack.c | 3 +- + net/xfrm/xfrm_policy.c | 20 +- + security/smack/smack_lsm.c | 36 +- + security/smack/smackfs.c | 61 ++- + 129 files changed, 2347 insertions(+), 1479 deletions(-) + create mode 100644 drivers/watchdog/hpwdt.c + create mode 100644 drivers/watchdog/sb_wdog.c +Merging quilt/driver-core +Merge made by recursive. + Documentation/ja_JP/stable_kernel_rules.txt | 106 +- + Documentation/vm/slabinfo.c | 2 +- + arch/arm/Kconfig | 2 + + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + drivers/base/bus.c | 9 +- + drivers/base/core.c | 1 + + drivers/base/driver.c | 3 + + drivers/base/memory.c | 29 +- + drivers/base/node.c | 7 +- + drivers/base/power/main.c | 3 +- + drivers/cpufreq/cpufreq.c | 8 - + drivers/media/video/Kconfig | 1 + + drivers/media/video/Makefile | 2 + + drivers/media/video/go7007/Kconfig | 14 + + drivers/media/video/go7007/Makefile | 17 + + drivers/media/video/go7007/go7007-driver.c | 693 +++++++++++ + drivers/media/video/go7007/go7007-fw.c | 1643 +++++++++++++++++++++++++++ + drivers/media/video/go7007/go7007-i2c.c | 309 +++++ + drivers/media/video/go7007/go7007-priv.h | 279 +++++ + drivers/media/video/go7007/go7007-usb.c | 1229 ++++++++++++++++++++ + drivers/media/video/go7007/go7007-v4l2.c | 1516 ++++++++++++++++++++++++ + drivers/media/video/go7007/go7007.h | 120 ++ + drivers/media/video/go7007/saa7134-go7007.c | 484 ++++++++ + drivers/media/video/go7007/snd-go7007.c | 315 +++++ + drivers/media/video/go7007/wis-i2c.h | 55 + + drivers/media/video/go7007/wis-ov7640.c | 146 +++ + drivers/media/video/go7007/wis-saa7113.c | 378 ++++++ + drivers/media/video/go7007/wis-saa7115.c | 507 +++++++++ + drivers/media/video/go7007/wis-sony-tuner.c | 757 ++++++++++++ + drivers/media/video/go7007/wis-tw2804.c | 383 +++++++ + drivers/media/video/go7007/wis-tw9903.c | 378 ++++++ + drivers/media/video/go7007/wis-uda1342.c | 136 +++ + drivers/net/phy/phy_device.c | 8 +- + drivers/uio/Kconfig | 10 +- + drivers/uio/uio_cif.c | 6 +- + fs/debugfs/inode.c | 4 - + fs/sysfs/file.c | 13 + + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/linux/debugfs.h | 5 + + include/linux/init.h | 1 + + include/linux/memory.h | 5 +- + include/linux/sysfs.h | 5 + + init/main.c | 9 + + lib/kobject.c | 52 + + mm/memory_hotplug.c | 2 +- + 47 files changed, 9540 insertions(+), 117 deletions(-) + create mode 100644 drivers/media/video/go7007/Kconfig + create mode 100644 drivers/media/video/go7007/Makefile + create mode 100644 drivers/media/video/go7007/go7007-driver.c + create mode 100644 drivers/media/video/go7007/go7007-fw.c + create mode 100644 drivers/media/video/go7007/go7007-i2c.c + create mode 100644 drivers/media/video/go7007/go7007-priv.h + create mode 100644 drivers/media/video/go7007/go7007-usb.c + create mode 100644 drivers/media/video/go7007/go7007-v4l2.c + create mode 100644 drivers/media/video/go7007/go7007.h + create mode 100644 drivers/media/video/go7007/saa7134-go7007.c + create mode 100644 drivers/media/video/go7007/snd-go7007.c + create mode 100644 drivers/media/video/go7007/wis-i2c.h + create mode 100644 drivers/media/video/go7007/wis-ov7640.c + create mode 100644 drivers/media/video/go7007/wis-saa7113.c + create mode 100644 drivers/media/video/go7007/wis-saa7115.c + create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c + create mode 100644 drivers/media/video/go7007/wis-tw2804.c + create mode 100644 drivers/media/video/go7007/wis-tw9903.c + create mode 100644 drivers/media/video/go7007/wis-uda1342.c +Merging quilt/pci +Merge made by recursive. + Documentation/kernel-parameters.txt | 4 - + arch/frv/mb93090-mb00/pci-frv.h | 2 - + arch/frv/mb93090-mb00/pci-vdk.c | 53 ----- + arch/mn10300/unit-asb2305/pci-asb2305.h | 2 - + arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- + arch/sh/drivers/pci/pci-sh4.h | 2 - + arch/x86/kernel/acpi/boot.c | 3 +- + arch/x86/kernel/pci-calgary_64.c | 3 +- + arch/x86/pci/acpi.c | 11 +- + arch/x86/pci/common.c | 61 ------ + arch/x86/pci/irq.c | 4 + + arch/x86/pci/pcbios.c | 72 ------- + arch/x86/pci/pci.h | 3 - + drivers/ide/ide-scan-pci.c | 9 +- + drivers/ide/ide.c | 12 - + drivers/pci/bus.c | 15 +- + drivers/pci/hotplug/Kconfig | 4 +- + drivers/pci/hotplug/acpiphp_core.c | 6 + + drivers/pci/hotplug/acpiphp_ibm.c | 33 ++-- + drivers/pci/hotplug/cpcihp_generic.c | 8 +- + drivers/pci/pci-acpi.c | 1 + + drivers/pci/pcie/aer/aerdrv_acpi.c | 3 + + drivers/pci/pcie/aer/aerdrv_core.c | 3 +- + drivers/pci/probe.c | 60 ++---- + drivers/pci/quirks.c | 79 +++++++- + drivers/pci/remove.c | 10 +- + drivers/pci/search.c | 313 +++++++++++----------------- + drivers/pci/setup-bus.c | 6 +- + drivers/pci/setup-res.c | 2 +- + drivers/pcmcia/i82092.c | 7 +- + include/asm-sh/mpc1211/pci.h | 2 - + include/linux/aer.h | 5 - + include/linux/ide.h | 1 - + include/linux/pci.h | 21 +-- + include/linux/pci_ids.h | 6 + + 35 files changed, 289 insertions(+), 544 deletions(-) +Merging quilt/usb +Merge made by recursive. + drivers/usb/atm/usbatm.c | 27 +- + drivers/usb/atm/usbatm.h | 2 +- + drivers/usb/class/cdc-acm.c | 10 +- + drivers/usb/class/usblp.c | 1 + + drivers/usb/core/config.c | 17 + + drivers/usb/core/hcd.h | 2 +- + drivers/usb/core/hub.h | 8 +- + drivers/usb/core/quirks.c | 9 + + drivers/usb/gadget/ether.c | 1 + + drivers/usb/gadget/m66592-udc.h | 2 +- + drivers/usb/gadget/printer.c | 2 +- + drivers/usb/gadget/serial.c | 3 +- + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/ehci-au1xxx.c | 5 +- + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/ehci-fsl.c | 9 +- + drivers/usb/host/ehci-hcd.c | 121 +- + drivers/usb/host/ehci-hub.c | 2 +- + drivers/usb/host/ehci-ixp4xx.c | 3 +- + drivers/usb/host/ehci-ppc-soc.c | 5 +- + drivers/usb/host/ehci-q.c | 16 +- + drivers/usb/host/ehci-sched.c | 14 +- + drivers/usb/host/ohci-hub.c | 24 +- + drivers/usb/host/ohci-sm501.c | 5 +- + drivers/usb/image/Kconfig | 9 + + drivers/usb/image/Makefile | 1 + + drivers/usb/image/f2255usb.h |40334 ++++++++++++++++++++++++++++++++++++ + drivers/usb/image/microtek.c | 1 - + drivers/usb/image/microtek.h | 1 - + drivers/usb/image/s2255drv.c | 2638 +++ + drivers/usb/image/s2255drv.h | 235 + + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/auerswald.c | 115 +- + drivers/usb/misc/gotemp.c | 295 + + drivers/usb/misc/trancevibrator.c | 4 +- + drivers/usb/serial/Kconfig | 10 + + drivers/usb/serial/Makefile | 3 +- + drivers/usb/serial/cypress_m8.c | 284 +- + drivers/usb/serial/ftdi_sio.c | 4 +- + drivers/usb/serial/io_ti.c | 10 +- + drivers/usb/serial/option.c | 40 +- + drivers/usb/serial/spcp8x5.c | 1079 + + drivers/usb/storage/Kconfig | 2 +- + drivers/usb/storage/libusual.c | 14 +- + drivers/usb/storage/transport.c | 11 - + drivers/usb/storage/unusual_devs.h | 14 +- + include/linux/usb.h | 177 +- + include/linux/usb/ch9.h | 14 +- + 49 files changed, 45198 insertions(+), 399 deletions(-) + create mode 100644 drivers/usb/image/f2255usb.h + create mode 100644 drivers/usb/image/s2255drv.c + create mode 100644 drivers/usb/image/s2255drv.h + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/serial/spcp8x5.c +Merging quilt/device-mapper +Already up-to-date. +Merging hid/mm +Merge made by recursive. + drivers/hid/usbhid/hid-core.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/i2c +Removed drivers/i2c/algos/i2c-algo-pca.h +Merge made by recursive. + drivers/i2c/algos/Kconfig | 39 ++--------- + drivers/i2c/algos/i2c-algo-pca.c | 125 ++++++++++++++++----------------- + drivers/i2c/algos/i2c-algo-pca.h | 26 ------- + drivers/i2c/busses/i2c-ibm_iic.c | 10 ++-- + drivers/i2c/busses/i2c-pca-isa.c | 53 +++++--------- + drivers/i2c/busses/i2c-pmcmsp.c | 4 +- + drivers/i2c/busses/i2c-pxa.c | 27 ++++--- + include/asm-mips/mach-db1x00/db1200.h | 1 + + include/asm-mips/mach-db1x00/db1x00.h | 1 + + include/asm-mips/mach-pb1x00/pb1200.h | 1 + + include/asm-mips/mach-pb1x00/pb1550.h | 1 + + include/linux/i2c-algo-pca.h | 37 +++++++++-- + include/linux/i2c.h | 2 +- + 13 files changed, 146 insertions(+), 181 deletions(-) + delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h +Merging quilt/kernel-doc +Merge made by recursive. + Documentation/DocBook/kernel-api.tmpl | 2 ++ + block/blk-core.c | 2 ++ + block/blk-settings.c | 1 - + drivers/ata/libata-scsi.c | 2 +- + kernel/audit.c | 4 ++-- + 5 files changed, 7 insertions(+), 4 deletions(-) +Merging avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/atstk1000/atstk1004.c | 2 +- + arch/avr32/kernel/process.c | 3 + + arch/avr32/kernel/semaphore.c | 124 +++++++++++++++--------------- + arch/avr32/kernel/time.c | 45 ++--------- + arch/avr32/mach-at32ap/at32ap700x.c | 7 ++- + arch/avr32/mm/fault.c | 2 + + drivers/char/keyboard.c | 3 +- + include/asm-avr32/arch-at32ap/board.h | 5 +- + include/asm-avr32/page.h | 8 +- + include/asm-avr32/pgtable.h | 1 + + include/asm-avr32/processor.h | 2 +- + 11 files changed, 93 insertions(+), 109 deletions(-) +Merging v4l-dvb/stable +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/media/video/Makefile +Merge made by recursive. + Documentation/video4linux/CARDLIST.saa7134 | 3 + + arch/arm/mach-pxa/devices.c | 32 + + arch/arm/mach-pxa/pcm990-baseboard.c | 86 ++ + drivers/media/Kconfig | 7 +- + drivers/media/common/ir-functions.c | 2 +- + drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/media/dvb/frontends/Kconfig | 7 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/cx22702.c | 2 +- + drivers/media/dvb/frontends/dvb-pll.c | 2 +- + drivers/media/dvb/frontends/isl6405.c | 164 ++++ + drivers/media/dvb/frontends/isl6405.h | 74 ++ + drivers/media/dvb/frontends/lgdt330x.c | 2 +- + drivers/media/dvb/frontends/nxt6000.c | 2 +- + drivers/media/dvb/frontends/s5h1409.c | 2 +- + drivers/media/dvb/frontends/s5h1420.c | 2 +- + drivers/media/dvb/frontends/sp8870.c | 12 +- + drivers/media/dvb/frontends/tda10086.c | 2 +- + drivers/media/dvb/frontends/tda18271-common.c | 19 +- + drivers/media/dvb/frontends/tda18271-fe.c | 230 ++---- + drivers/media/dvb/frontends/tda18271-priv.h | 7 +- + drivers/media/dvb/frontends/tda826x.c | 2 +- + drivers/media/dvb/frontends/tda827x.c | 2 +- + drivers/media/dvb/frontends/ves1x93.c | 2 +- + drivers/media/dvb/frontends/xc5000.c | 2 +- + drivers/media/dvb/frontends/zl10353.c | 2 +- + drivers/media/dvb/ttpci/budget-ci.c | 2 +- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +- + drivers/media/radio/miropcm20-rds.c | 2 +- + drivers/media/radio/radio-cadet.c | 10 +- + drivers/media/radio/radio-typhoon.c | 2 +- + drivers/media/video/Kconfig | 45 + + drivers/media/video/Makefile | 8 +- + drivers/media/video/adv7170.c | 2 +- + drivers/media/video/adv7175.c | 2 +- + drivers/media/video/arv.c | 4 +- + drivers/media/video/bt819.c | 2 +- + drivers/media/video/bt856.c | 2 +- + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- + drivers/media/video/bw-qcam.c | 4 +- + drivers/media/video/c-qcam.c | 4 +- + drivers/media/video/cafe_ccic.c | 4 +- + drivers/media/video/cpia2/cpia2_core.c | 4 +- + drivers/media/video/cpia2/cpia2_usb.c | 2 +- + drivers/media/video/cx23885/cx23885-i2c.c | 2 +- + drivers/media/video/cx88/cx88-blackbird.c | 2 +- + drivers/media/video/cx88/cx88-core.c | 6 +- + drivers/media/video/cx88/cx88-dvb.c | 2 +- + drivers/media/video/cx88/cx88-i2c.c | 4 +- + drivers/media/video/cx88/cx88-input.c | 2 +- + drivers/media/video/cx88/cx88-mpeg.c | 2 +- + drivers/media/video/cx88/cx88-tvaudio.c | 6 +- + drivers/media/video/cx88/cx88-vbi.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 4 +- + drivers/media/video/dpc7146.c | 4 +- + drivers/media/video/em28xx/em28xx-core.c | 6 +- + drivers/media/video/em28xx/em28xx-i2c.c | 4 +- + drivers/media/video/em28xx/em28xx-video.c | 2 +- + drivers/media/video/et61x251/et61x251_core.c | 2 +- + drivers/media/video/hexium_gemini.c | 4 +- + drivers/media/video/hexium_orion.c | 4 +- + drivers/media/video/ir-kbd-i2c.c | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 6 +- + drivers/media/video/ivtv/ivtv-yuv.c | 6 +- + drivers/media/video/meye.c | 12 +- + drivers/media/video/mt20xx.c | 7 +- + drivers/media/video/mt9m001.c | 692 +++++++++++++++ + drivers/media/video/mt9v022.c | 802 +++++++++++++++++ + drivers/media/video/mxb.c | 4 +- + drivers/media/video/pms.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/video/pwc/pwc-if.c | 8 +- + drivers/media/video/pxa_camera.c | 937 ++++++++++++++++++++ + drivers/media/video/saa6588.c | 8 +- + drivers/media/video/saa7110.c | 2 +- + drivers/media/video/saa7111.c | 2 +- + drivers/media/video/saa7114.c | 2 +- + drivers/media/video/saa7115.c | 2 +- + drivers/media/video/saa711x.c | 2 +- + drivers/media/video/saa7134/saa7134-alsa.c | 2 +- + drivers/media/video/saa7134/saa7134-cards.c | 134 +++- + drivers/media/video/saa7134/saa7134-core.c | 10 +- + drivers/media/video/saa7134/saa7134-dvb.c | 86 ++- + drivers/media/video/saa7134/saa7134-empress.c | 2 +- + drivers/media/video/saa7134/saa7134-i2c.c | 4 +- + drivers/media/video/saa7134/saa7134-input.c | 6 +- + drivers/media/video/saa7134/saa7134-ts.c | 2 +- + drivers/media/video/saa7134/saa7134-tvaudio.c | 6 +- + drivers/media/video/saa7134/saa7134-vbi.c | 2 +- + drivers/media/video/saa7134/saa7134-video.c | 2 +- + drivers/media/video/saa7134/saa7134.h | 9 +- + drivers/media/video/saa7185.c | 2 +- + drivers/media/video/se401.c | 2 +- + drivers/media/video/sn9c102/sn9c102_core.c | 4 +- + drivers/media/video/soc_camera.c | 973 +++++++++++++++++++++ + drivers/media/video/stradis.c | 4 +- + drivers/media/video/stv680.c | 9 +- + drivers/media/video/tda8290.c | 3 +- + drivers/media/video/tda9840.c | 2 +- + drivers/media/video/tda9887.c | 3 +- + drivers/media/video/tea5761.c | 7 +- + drivers/media/video/tea5767.c | 34 +- + drivers/media/video/tea6415c.c | 2 +- + drivers/media/video/tea6420.c | 2 +- + drivers/media/video/tuner-core.c | 44 +- + drivers/media/video/tuner-i2c.h | 118 +++- + drivers/media/video/tuner-simple.c | 506 +++++++----- + drivers/media/video/tuner-simple.h | 11 +- + drivers/media/video/tuner-types.c | 6 + + drivers/media/video/tuner-xc2028.c | 10 +- + drivers/media/video/tvaudio.c | 8 +- + drivers/media/video/tvp5150.c | 2 +- + drivers/media/video/usbvideo/ibmcam.c | 2 +- + drivers/media/video/usbvideo/konicawc.c | 2 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- + drivers/media/video/usbvideo/ultracam.c | 4 +- + drivers/media/video/usbvideo/usbvideo.c | 2 +- + drivers/media/video/usbvision/usbvision-core.c | 14 +- + drivers/media/video/usbvision/usbvision-i2c.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 4 +- + drivers/media/video/v4l1-compat.c | 2 +- + drivers/media/video/videobuf-dma-sg.c | 2 +- + drivers/media/video/videobuf-dvb.c | 2 +- + drivers/media/video/videobuf-vmalloc.c | 2 +- + drivers/media/video/videocodec.c | 4 +- + drivers/media/video/vino.c | 10 +- + drivers/media/video/vpx3220.c | 2 +- + drivers/media/video/w9966.c | 4 +- + drivers/media/video/w9968cf.c | 2 +- + drivers/media/video/zc0301/zc0301_core.c | 2 +- + drivers/media/video/zoran_card.c | 6 +- + drivers/media/video/zoran_device.c | 5 +- + drivers/media/video/zoran_driver.c | 2 +- + drivers/media/video/zr36016.c | 5 +- + drivers/media/video/zr36050.c | 5 +- + drivers/media/video/zr36060.c | 6 +- + drivers/media/video/zr364xx.c | 4 +- + include/asm-arm/arch-pxa/camera.h | 48 + + include/asm-arm/arch-pxa/pxa-regs.h | 166 +++- + include/linux/meye.h | 2 +- + include/linux/videodev2.h | 52 +- + include/media/soc_camera.h | 147 ++++ + include/media/v4l2-chip-ident.h | 6 + + 146 files changed, 5170 insertions(+), 708 deletions(-) + create mode 100644 drivers/media/dvb/frontends/isl6405.c + create mode 100644 drivers/media/dvb/frontends/isl6405.h + create mode 100644 drivers/media/video/mt9m001.c + create mode 100644 drivers/media/video/mt9v022.c + create mode 100644 drivers/media/video/pxa_camera.c + create mode 100644 drivers/media/video/soc_camera.c + create mode 100644 include/asm-arm/arch-pxa/camera.h + create mode 100644 include/media/soc_camera.h +Merging s390/features +Merge made by recursive. + drivers/s390/block/dasd_3990_erp.c | 36 ++++++++++++++++++++++++++++++++++++ + drivers/s390/block/dasd_int.h | 5 +++++ + 2 files changed, 41 insertions(+), 0 deletions(-) +Merging sh/master +Merge made by recursive. + arch/sh/Kconfig | 1 + + arch/sh/kernel/cpu/sh3/probe.c | 4 ++-- + include/asm-sh/cpu-sh3/cache.h | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging jfs/next +Merge made by recursive. + fs/jfs/jfs_dmap.c | 11 +++++------ + fs/jfs/jfs_imap.c | 15 ++++++--------- + fs/jfs/jfs_xtree.c | 26 ++++++++------------------ + 3 files changed, 19 insertions(+), 33 deletions(-) +Merging kbuild/master +Already up-to-date. +Merging quilt/pata +Auto-merged drivers/ide/ide.c +Removed include/linux/hdsmart.h +Auto-merged include/linux/ide.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 14 +- + Documentation/ide.txt | 36 +-- + Documentation/ide/warm-plug-howto.txt | 13 + + arch/powerpc/kernel/setup_32.c | 8 - + arch/powerpc/platforms/powermac/pci.c | 22 -- + arch/powerpc/platforms/powermac/pmac.h | 5 - + arch/powerpc/platforms/powermac/setup.c | 8 - + arch/ppc/configs/sandpoint_defconfig | 2 +- + arch/ppc/kernel/ppc_ksyms.c | 5 - + arch/ppc/kernel/setup.c | 2 - + arch/ppc/platforms/4xx/bamboo.c | 1 - + arch/ppc/platforms/4xx/ebony.c | 1 - + arch/ppc/platforms/4xx/luan.c | 1 - + arch/ppc/platforms/4xx/ocotea.c | 1 - + arch/ppc/platforms/4xx/taishan.c | 1 - + arch/ppc/platforms/4xx/yucca.c | 1 - + arch/ppc/platforms/chestnut.c | 1 - + arch/ppc/platforms/cpci690.c | 1 - + arch/ppc/platforms/ev64260.c | 1 - + arch/ppc/platforms/hdpu.c | 36 -- + arch/ppc/platforms/lopec.c | 85 ----- + arch/ppc/platforms/mvme5100.c | 1 - + arch/ppc/platforms/powerpmc250.c | 1 - + arch/ppc/platforms/pplus.c | 58 --- + arch/ppc/platforms/prep_setup.c | 38 -- + arch/ppc/platforms/prpmc750.c | 1 - + arch/ppc/platforms/prpmc800.c | 1 - + arch/ppc/platforms/radstone_ppc7d.c | 1 - + arch/ppc/platforms/residual.c | 1 - + arch/ppc/platforms/sandpoint.c | 94 ----- + arch/ppc/platforms/sandpoint.h | 3 - + arch/ppc/platforms/spruce.c | 1 - + arch/ppc/syslib/m8xx_setup.c | 6 - + arch/ppc/syslib/ppc4xx_setup.c | 23 -- + block/compat_ioctl.c | 1 - + drivers/ide/Kconfig | 35 +-- + drivers/ide/Makefile | 2 +- + drivers/ide/arm/bast-ide.c | 6 +- + drivers/ide/arm/icside.c | 2 +- + drivers/ide/arm/ide_arm.c | 2 +- + drivers/ide/arm/palm_bk3710.c | 30 +- + drivers/ide/arm/rapide.c | 4 +- + drivers/ide/cris/ide-cris.c | 20 +- + drivers/ide/h8300/ide-h8300.c | 3 +- + drivers/ide/ide-acpi.c | 2 + + drivers/ide/ide-cd.c | 134 +------- + drivers/ide/ide-cd.h | 4 - + drivers/ide/ide-disk.c | 164 +++++---- + drivers/ide/ide-floppy.c | 346 +++++++----------- + drivers/ide/ide-generic.c | 104 +++++- + drivers/ide/ide-io.c | 38 ++- + drivers/ide/ide-iops.c | 86 +++-- + drivers/ide/ide-lib.c | 10 - + drivers/ide/ide-pnp.c | 4 +- + drivers/ide/ide-probe.c | 179 ++++++++-- + drivers/ide/ide-proc.c | 3 - + drivers/ide/ide-tape.c | 541 +++++++++++++--------------- + drivers/ide/ide-taskfile.c | 29 +- + drivers/ide/ide.c | 416 +++++----------------- + drivers/ide/legacy/Makefile | 1 + + drivers/ide/legacy/ali14xx.c | 27 ++- + drivers/ide/legacy/buddha.c | 2 +- + drivers/ide/legacy/dtc2278.c | 30 ++- + drivers/ide/legacy/falconide.c | 2 +- + drivers/ide/legacy/gayle.c | 2 +- + drivers/ide/legacy/ht6560b.c | 51 ++- + drivers/ide/legacy/ide-4drives.c | 56 +++ + drivers/ide/legacy/ide-cs.c | 8 +- + drivers/ide/legacy/ide_platform.c | 4 +- + drivers/ide/legacy/macide.c | 2 +- + drivers/ide/legacy/q40ide.c | 2 +- + drivers/ide/legacy/qd65xx.c | 106 ++++-- + drivers/ide/legacy/umc8672.c | 31 ++- + drivers/ide/mips/au1xxx-ide.c | 13 +- + drivers/ide/mips/swarm.c | 9 +- + drivers/ide/pci/aec62xx.c | 3 +- + drivers/ide/pci/alim15x3.c | 1 - + drivers/ide/pci/amd74xx.c | 4 +- + drivers/ide/pci/atiixp.c | 5 +- + drivers/ide/pci/cmd640.c | 122 ++++---- + drivers/ide/pci/cmd64x.c | 9 +- + drivers/ide/pci/cs5520.c | 3 +- + drivers/ide/pci/cs5530.c | 3 +- + drivers/ide/pci/cs5535.c | 2 +- + drivers/ide/pci/cy82c693.c | 3 +- + drivers/ide/pci/delkin_cb.c | 8 +- + drivers/ide/pci/generic.c | 6 +- + drivers/ide/pci/hpt34x.c | 2 +- + drivers/ide/pci/hpt366.c | 4 +- + drivers/ide/pci/it8213.c | 3 +- + drivers/ide/pci/it821x.c | 1 - + drivers/ide/pci/jmicron.c | 1 - + drivers/ide/pci/ns87415.c | 7 +- + drivers/ide/pci/opti621.c | 6 +- + drivers/ide/pci/piix.c | 4 +- + drivers/ide/pci/rz1000.c | 2 +- + drivers/ide/pci/sc1200.c | 3 +- + drivers/ide/pci/scc_pata.c | 17 +- + drivers/ide/pci/serverworks.c | 5 +- + drivers/ide/pci/sgiioc4.c | 31 +- + drivers/ide/pci/siimage.c | 1 - + drivers/ide/pci/sis5513.c | 3 +- + drivers/ide/pci/sl82c105.c | 7 +- + drivers/ide/pci/slc90e66.c | 2 +- + drivers/ide/pci/triflex.c | 1 - + drivers/ide/pci/trm290.c | 1 - + drivers/ide/pci/via82cxxx.c | 4 +- + drivers/ide/ppc/mpc8xx.c | 86 ++---- + drivers/ide/ppc/pmac.c | 194 ++++------- + drivers/ide/setup-pci.c | 90 +----- + drivers/macintosh/mediabay.c | 17 +- + drivers/scsi/ide-scsi.c | 203 +++++------ + include/asm-alpha/ide.h | 11 - + include/asm-arm/ide.h | 8 - + include/asm-blackfin/ide.h | 4 - + include/asm-ia64/ide.h | 10 - + include/asm-m32r/ide.h | 10 - + include/asm-mips/mach-generic/ide.h | 10 - + include/asm-parisc/ide.h | 2 - + include/asm-powerpc/ide.h | 57 ++-- + include/asm-powerpc/mediabay.h | 6 +- + include/asm-sh/ide.h | 3 - + include/asm-sparc/ide.h | 2 - + include/asm-sparc64/ide.h | 2 - + include/asm-x86/ide.h | 10 - + include/linux/Kbuild | 1 - + include/linux/hdreg.h | 4 +- + include/linux/hdsmart.h | 126 ------- + include/linux/ide.h | 191 ++++++---- + 129 files changed, 1732 insertions(+), 2574 deletions(-) + create mode 100644 Documentation/ide/warm-plug-howto.txt + create mode 100644 drivers/ide/legacy/ide-4drives.c + delete mode 100644 include/linux/hdsmart.h +Merging libata/NEXT +Already up-to-date. +Merging nfs/linux-next +Merge made by recursive. + fs/nfs/write.c | 34 +++++++++++++++++++--------------- + include/linux/sunrpc/clnt.h | 9 +++++---- + net/sunrpc/clnt.c | 4 ++-- + 3 files changed, 26 insertions(+), 21 deletions(-) +Merging xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_linux.h | 1 - + fs/xfs/linux-2.6/xfs_super.c | 3 +- + fs/xfs/linux-2.6/xfs_vnode.h | 5 +- + fs/xfs/xfs_bmap.c | 4 + + fs/xfs/xfs_iget.c | 49 +--- + fs/xfs/xfs_inode.c | 655 +++++++++++++++++++++--------------------- + fs/xfs/xfs_inode.h | 23 +-- + fs/xfs/xfs_inode_item.h | 8 + + fs/xfs/xfs_itable.c | 3 +- + fs/xfs/xfs_log.c | 47 ++-- + fs/xfs/xfs_log_priv.h | 2 +- + fs/xfs/xfs_log_recover.c | 3 +- + fs/xfs/xfs_rename.c | 5 +- + fs/xfs/xfs_trans_buf.c | 3 +- + fs/xfs/xfs_vfsops.c | 25 -- + fs/xfs/xfs_vnodeops.c | 113 ++------ + 16 files changed, 402 insertions(+), 547 deletions(-) +Merging infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/mlx4/mad.c | 2 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 10 +++++----- + drivers/infiniband/hw/mthca/mthca_eq.c | 4 ++-- + drivers/infiniband/hw/mthca/mthca_mad.c | 2 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 2 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- + drivers/net/mlx4/cmd.c | 3 ++- + 8 files changed, 14 insertions(+), 13 deletions(-) +Merging acpi/test +Auto-merged arch/x86/kernel/head_64.S +Auto-merged arch/x86/mm/pageattr.c +Auto-merged drivers/base/power/main.c +Auto-merged drivers/pci/pci-acpi.c +Merge made by recursive. + Documentation/laptops/thinkpad-acpi.txt | 63 ++++--- + arch/powerpc/Kconfig | 2 + + arch/x86/boot/Makefile | 2 +- + arch/x86/boot/boot.h | 5 + + arch/x86/boot/video-bios.c | 6 + + arch/x86/boot/video-mode.c | 173 +++++++++++++++ + arch/x86/boot/video-vesa.c | 8 + + arch/x86/boot/video-vga.c | 12 +- + arch/x86/boot/video.c | 157 +-------------- + arch/x86/kernel/acpi/Makefile | 8 +- + arch/x86/kernel/acpi/realmode/Makefile | 58 +++++ + arch/x86/kernel/acpi/realmode/copy.S | 1 + + arch/x86/kernel/acpi/realmode/video-bios.c | 1 + + arch/x86/kernel/acpi/realmode/video-mode.c | 1 + + arch/x86/kernel/acpi/realmode/video-vesa.c | 1 + + arch/x86/kernel/acpi/realmode/video-vga.c | 1 + + arch/x86/kernel/acpi/realmode/wakemain.c | 81 +++++++ + arch/x86/kernel/acpi/realmode/wakeup.S | 115 ++++++++++ + arch/x86/kernel/acpi/realmode/wakeup.h | 36 ++++ + arch/x86/kernel/acpi/realmode/wakeup.lds.S | 61 ++++++ + arch/x86/kernel/acpi/sleep.c | 72 ++++++- + arch/x86/kernel/acpi/sleep.h | 17 ++ + arch/x86/kernel/acpi/wakeup_32.S | 247 ++-------------------- + arch/x86/kernel/acpi/wakeup_64.S | 313 +--------------------------- + arch/x86/kernel/acpi/wakeup_rm.S | 10 + + arch/x86/kernel/head_64.S | 4 - + arch/x86/kernel/setup_32.c | 4 +- + arch/x86/kernel/smpboot_64.c | 5 +- + arch/x86/mm/pageattr.c | 19 ++- + drivers/acpi/ec.c | 6 +- + drivers/acpi/fan.c | 30 ++- + drivers/acpi/processor_core.c | 39 ++-- + drivers/acpi/utils.c | 18 +- + drivers/acpi/video.c | 3 + + drivers/misc/Kconfig | 17 ++ + drivers/misc/acer-wmi.c | 9 + + drivers/misc/intel_menlow.c | 11 +- + drivers/misc/thinkpad_acpi.c | 123 +++++++++-- + drivers/pci/pci-acpi.c | 2 - + drivers/thermal/thermal.c | 39 +++-- + include/linux/mm.h | 6 + + kernel/power/snapshot.c | 42 +++-- + 42 files changed, 1003 insertions(+), 825 deletions(-) + create mode 100644 arch/x86/boot/video-mode.c + create mode 100644 arch/x86/kernel/acpi/realmode/Makefile + create mode 100644 arch/x86/kernel/acpi/realmode/copy.S + create mode 100644 arch/x86/kernel/acpi/realmode/video-bios.c + create mode 100644 arch/x86/kernel/acpi/realmode/video-mode.c + create mode 100644 arch/x86/kernel/acpi/realmode/video-vesa.c + create mode 100644 arch/x86/kernel/acpi/realmode/video-vga.c + create mode 100644 arch/x86/kernel/acpi/realmode/wakemain.c + create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.S + create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.h + create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.lds.S + create mode 100644 arch/x86/kernel/acpi/sleep.h + create mode 100644 arch/x86/kernel/acpi/wakeup_rm.S +Applying acpi-fix-1.patch.patch +Merging blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +Merge made by recursive. + fs/Kconfig | 94 +++++++++++++++------------- + fs/lockd/host.c | 9 +-- + fs/lockd/svc.c | 132 +++++++++++++++++---------------------- + fs/lockd/svclock.c | 3 +- + fs/lockd/svcshare.c | 2 +- + fs/nfs/symlink.c | 1 - + fs/nfsd/export.c | 9 ++- + fs/nfsd/nfs4state.c | 57 ++++++++++------- + fs/nfsd/nfs4xdr.c | 13 +++- + fs/nfsd/nfsctl.c | 15 ++++- + fs/nfsd/nfssvc.c | 2 - + fs/nfsd/vfs.c | 2 +- + include/linux/nfs3.h | 2 +- + include/linux/sunrpc/cache.h | 1 - + include/linux/sunrpc/svcauth.h | 5 +- + include/net/ipv6.h | 9 +++ + net/sunrpc/cache.c | 1 - + net/sunrpc/svc_xprt.c | 30 ++++++++- + net/sunrpc/svcauth_unix.c | 118 ++++++++++++++++++++++++------------ + net/sunrpc/svcsock.c | 1 + + 20 files changed, 298 insertions(+), 208 deletions(-) +Merging firewire/for-next +Merge made by recursive. + Documentation/debugging-via-ohci1394.txt | 17 +- + drivers/firewire/fw-cdev.c | 8 +- + drivers/firewire/fw-device.c | 48 +++-- + drivers/firewire/fw-device.h | 2 +- + drivers/firewire/fw-sbp2.c | 365 +++++++++++++++++++++++------- + drivers/ieee1394/csr.c | 6 +- + drivers/ieee1394/dv1394.c | 3 +- + drivers/ieee1394/nodemgr.c | 6 +- + drivers/ieee1394/raw1394.c | 1 - + drivers/ieee1394/sbp2.c | 22 ++- + drivers/ieee1394/sbp2.h | 2 + + drivers/ieee1394/video1394.c | 3 +- + 12 files changed, 356 insertions(+), 127 deletions(-) +Merging hwmon/testing +Auto-merged MAINTAINERS +Merge made by recursive. + Documentation/hwmon/adt7473 | 79 +++ + Documentation/hwmon/coretemp | 6 +- + MAINTAINERS | 2 +- + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ad7418.c | 2 +- + drivers/hwmon/adm1021.c | 6 +- + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 4 +- + drivers/hwmon/adm1029.c | 6 +- + drivers/hwmon/adm1031.c | 2 +- + drivers/hwmon/adm9240.c | 2 +- + drivers/hwmon/ads7828.c | 2 +- + drivers/hwmon/adt7470.c | 2 +- + drivers/hwmon/adt7473.c | 1157 ++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/applesmc.c | 29 +- + drivers/hwmon/asb100.c | 2 +- + drivers/hwmon/atxp1.c | 2 +- + drivers/hwmon/coretemp.c | 119 +++-- + drivers/hwmon/dme1737.c | 7 +- + drivers/hwmon/ds1621.c | 2 +- + drivers/hwmon/f71805f.c | 5 + + drivers/hwmon/f71882fg.c | 5 + + drivers/hwmon/f75375s.c | 2 +- + drivers/hwmon/fscher.c | 2 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/fscpos.c | 2 +- + drivers/hwmon/gl518sm.c | 2 +- + drivers/hwmon/gl520sm.c | 2 +- + drivers/hwmon/it87.c | 5 + + drivers/hwmon/lm63.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/lm77.c | 3 +- + drivers/hwmon/lm78.c | 4 +- + drivers/hwmon/lm80.c | 4 +- + drivers/hwmon/lm83.c | 6 +- + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm87.c | 2 +- + drivers/hwmon/lm90.c | 6 +- + drivers/hwmon/lm92.c | 20 +- + drivers/hwmon/lm93.c | 2 +- + drivers/hwmon/max1619.c | 23 +- + drivers/hwmon/max6650.c | 3 +- + drivers/hwmon/pc87360.c | 6 + + drivers/hwmon/pc87427.c | 5 + + drivers/hwmon/sis5595.c | 5 + + drivers/hwmon/smsc47b397.c | 5 + + drivers/hwmon/smsc47m1.c | 30 +- + drivers/hwmon/smsc47m192.c | 2 +- + drivers/hwmon/thmc50.c | 8 +- + drivers/hwmon/via686a.c | 33 ++ + drivers/hwmon/vt1211.c | 5 + + drivers/hwmon/vt8231.c | 49 ++- + drivers/hwmon/w83627ehf.c | 6 + + drivers/hwmon/w83627hf.c | 5 + + drivers/hwmon/w83781d.c | 4 +- + drivers/hwmon/w83791d.c | 3 +- + drivers/hwmon/w83792d.c | 3 +- + drivers/hwmon/w83793.c | 3 +- + drivers/hwmon/w83l785ts.c | 2 +- + drivers/hwmon/w83l786ng.c | 2 +- + 61 files changed, 1606 insertions(+), 120 deletions(-) + create mode 100644 Documentation/hwmon/adt7473 + create mode 100644 drivers/hwmon/adt7473.c +Merging ubi/master +Merge made by recursive. + Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ + drivers/mtd/ubi/build.c | 18 +- + drivers/mtd/ubi/debug.h | 2 + + drivers/mtd/ubi/io.c | 4 + + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- + drivers/mtd/ubi/ubi.h | 13 +- + drivers/mtd/ubi/vmt.c | 4 +- + include/mtd/Kbuild | 1 - + 8 files changed, 239 insertions(+), 23 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-ubi + rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) +Merging kvm/master +Auto-merged arch/x86/kernel/setup_32.c +Merge made by recursive. + arch/x86/Kconfig | 10 ++ + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/kvmclock.c | 161 ++++++++++++++++++++++++++++++ + arch/x86/kernel/setup_32.c | 5 + + arch/x86/kernel/setup_64.c | 5 + + arch/x86/kvm/kvm_svm.h | 2 + + arch/x86/kvm/mmu.c | 192 ++++++++++++++++++++++++++++-------- + arch/x86/kvm/mmu.h | 6 + + arch/x86/kvm/paging_tmpl.h | 37 ++++---- + arch/x86/kvm/svm.c | 233 ++++++++++++++++++++++++++++++++++-------- + arch/x86/kvm/vmx.c | 120 +++++++++++++++++----- + arch/x86/kvm/vmx.h | 10 ++- + arch/x86/kvm/x86.c | 238 ++++++++++++++++++++++++++++++++----------- + arch/x86/kvm/x86_emulate.c | 154 ++++++++++++++++------------ + include/asm-x86/kvm_host.h | 16 +++- + include/asm-x86/kvm_para.h | 25 +++++ + include/linux/kvm.h | 5 +- + include/linux/kvm_host.h | 3 + + virt/kvm/kvm_main.c | 18 +++- + 19 files changed, 974 insertions(+), 267 deletions(-) + create mode 100644 arch/x86/kernel/kvmclock.c +Merging dlm/next +Merge made by recursive. + fs/dlm/config.c | 2 +- + fs/dlm/lock.c | 2 +- + fs/dlm/lock.h | 1 - + 3 files changed, 2 insertions(+), 3 deletions(-) |