From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 0c3efe5..94c8a98 master -> origin/master Checking out files: 16% (62/383) Checking out files: 17% (66/383) Checking out files: 18% (69/383) Checking out files: 19% (73/383) Checking out files: 20% (77/383) Checking out files: 21% (81/383) Checking out## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Updating 0ce790e..782b86e Fast-forward Documentation/00-INDEX | 4 +- .../ABI/testing/sysfs-driver-hid-roccat-kone | 2 +- .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 8 +- .../ABI/testing/sysfs-driver-hid-roccat-kovaplus | 8 +- .../ABI/testing/sysfs-driver-hid-roccat-pyra | 8 +- .../ABI/testing/sysfs-platform-asus-laptop | 2 +- Documentation/cgroups/cgroups.txt | 12 +- Documentation/devicetree/booting-without-of.txt | 6 +- Documentation/dvb/udev.txt | 2 +- Documentation/edac.txt | 2 +- Documentation/kernel-parameters.txt | 16 +- Documentation/kmemleak.txt | 4 +- Documentation/laptops/asus-laptop.txt | 4 +- Documentation/leds/00-INDEX | 8 + Documentation/{ => leds}/leds-class.txt | 1 - Documentation/{ => leds}/leds-lp3944.txt | 0 Documentation/networking/batman-adv.txt | 2 +- Documentation/s390/Debugging390.txt | 2 +- Documentation/scheduler/sched-domains.txt | 32 ++- Documentation/scsi/sym53c8xx_2.txt | 2 +- Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- Documentation/sound/oss/AudioExcelDSP16 | 6 +- Documentation/sound/oss/README.ymfsb | 2 +- Documentation/video4linux/bttv/Insmod-options | 2 +- Documentation/video4linux/bttv/Sound-FAQ | 2 +- Documentation/video4linux/et61x251.txt | 4 +- Documentation/video4linux/sn9c102.txt | 4 +- Documentation/video4linux/w9968cf.txt | 2 +- Documentation/video4linux/zc0301.txt | 6 +- arch/alpha/Kconfig | 1 - arch/arm/Kconfig | 1 + arch/arm/boot/compressed/head.S | 10 +- arch/arm/boot/compressed/misc.c | 12 +- arch/arm/include/asm/mach/udc_pxa2xx.h | 2 - arch/arm/kernel/debug.S | 19 +- arch/arm/kernel/etm.c | 4 +- arch/arm/kernel/kprobes-decode.c | 10 +- arch/arm/kernel/perf_event.c | 33 ++- arch/arm/kernel/perf_event_v6.c | 2 +- arch/arm/kernel/perf_event_v7.c | 26 +- arch/arm/kernel/perf_event_xscale.c | 4 +- arch/arm/kernel/sleep.S | 14 +- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +- arch/arm/mach-kirkwood/sheevaplug-setup.c | 7 + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 14 +- arch/arm/mach-mx3/mach-pcm043.c | 12 +- arch/arm/mach-mx5/Kconfig | 1 + arch/arm/mach-mx5/Makefile | 2 +- arch/arm/mach-mx5/board-mx51_babbage.c | 5 +- arch/arm/mach-mx5/board-mx53_evk.c | 9 +- arch/arm/mach-mx5/board-mx53_loco.c | 25 ++ arch/arm/mach-mx5/clock-mx51-mx53.c | 9 + arch/arm/mach-mx5/cpu.c | 59 ++++ arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 4 + arch/arm/mach-mx5/mx51_efika.c | 1 - arch/arm/mach-mx5/system.c | 84 +++++ arch/arm/mach-mxs/Kconfig | 2 + arch/arm/mach-mxs/clock-mx23.c | 15 + arch/arm/mach-mxs/clock-mx28.c | 18 + arch/arm/mach-mxs/devices-mx23.h | 4 + arch/arm/mach-mxs/devices-mx28.h | 4 + arch/arm/mach-mxs/devices/Kconfig | 3 + arch/arm/mach-mxs/devices/Makefile | 1 + arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 73 ++++ arch/arm/mach-mxs/include/mach/devices-common.h | 13 + arch/arm/mach-mxs/mach-mx23evk.c | 44 +++ arch/arm/mach-mxs/mach-mx28evk.c | 89 +++++ arch/arm/mach-mxs/module-tx28.c | 41 ++- arch/arm/mach-mxs/module-tx28.h | 1 + arch/arm/mach-orion5x/ts78xx-setup.c | 18 +- arch/arm/mach-pxa/am200epd.c | 8 +- arch/arm/mach-pxa/am300epd.c | 13 +- arch/arm/mach-pxa/balloon3.c | 2 +- arch/arm/mach-pxa/cm-x2xx.c | 2 +- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +- arch/arm/mach-pxa/corgi.c | 1 - arch/arm/mach-pxa/devices.c | 9 +- arch/arm/mach-pxa/em-x270.c | 2 +- arch/arm/mach-pxa/eseries.c | 36 ++- arch/arm/mach-pxa/ezx.c | 12 +- arch/arm/mach-pxa/gumstix.c | 13 +- arch/arm/mach-pxa/idp.c | 2 +- arch/arm/mach-pxa/include/mach/palmz72.h | 5 + arch/arm/mach-pxa/include/mach/pxafb.h | 4 +- arch/arm/mach-pxa/include/mach/z2.h | 3 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/lpd270.c | 2 +- arch/arm/mach-pxa/lubbock.c | 2 +- arch/arm/mach-pxa/magician.c | 2 +- arch/arm/mach-pxa/mainstone.c | 2 +- archFrom . * branch block-for-next -> FETCH_HEAD Died at /pub/linux/kernel/people/jejb/build.pl line 103. 5 +- arch/arm/mach-pxa/palmtc.c | 2 +- arch/arm/mach-pxa/palmte2.c | 33 +-- arch/arm/mach-pxa/palmz72.c | 127 +++++++ arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- arch/arm/mach-pxa/poodle.c | 3 +- arch/arm/mach-pxa/raumfeld.c | 2 +- arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-pxa/spitz.c | 2 +- arch/arm/mach-pxa/tavorevb.c | 2 +- arch/arm/mach-pxa/time.c | 5 +- arch/arm/mach-pxa/tosa.c | 13 +- arch/arm/mach-pxa/trizeps4.c | 4 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-pxa/vpac270.c | 2 +- arch/arm/mach-pxa/z2.c | 77 +++--- arch/arm/mach-pxa/zeus.c | 2 +- arch/arm/mach-pxa/zylonite.c | 4 +- arch/arm/mach-realview/realview_eb.c | 2 +- arch/arm/mach-versatile/core.c | 2 +- arch/arm/plat-mxc/devices/platform-fec.c | 2 +- arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | 2 +- arch/arm/plat-mxc/include/mach/audmux.h | 10 +- arch/arm/plat-mxc/include/mach/iomux-mx2x.h | 12 +- arch/arm/plat-mxc/include/mach/mx50.h | 4 + arch/arm/plat-mxc/include/mach/mx51.h | 1 + arch/arm/plat-mxc/include/mach/mxc.h | 23 ++ arch/arm/plat-mxc/include/mach/system.h | 6 +- arch/arm/plat-mxc/time.c | 25 ++- arch/avr32/Kconfig | 1 - arch/avr32/mach-at32ap/pio.c | 2 +- arch/blackfin/Kconfig | 1 - arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | 1 - arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - arch/blackfin/configs/BlackStamp_defconfig | 1 + arch/blackfin/configs/CM-BF527_defconfig | 1 - arch/blackfin/configs/CM-BF533_defconfig | 1 - arch/blackfin/configs/CM-BF548_defconfig | 1 - arch/blackfin/configs/DNP5370_defconfig | 1 - arch/blackfin/configs/H8606_defconfig | 1 + arch/blackfin/configs/SRV1_defconfig | 1 + arch/blackfin/include/asm/bitops.h | 4 +- arch/blackfin/kernel/module.c | 45 +-- arch/cris/Kconfig | 1 - arch/frv/Kconfig | 1 - arch/h8300/Kconfig | 1 - arch/ia64/sn/kernel/irq.c | 2 +- arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 42 --- arch/m32r/Kconfig | 1 - arch/m68k/Kconfig | 1 - arch/microblaze/Kconfig | 1 - arch/microblaze/include/asm/unistd.h | 6 +- arch/microblaze/kernel/Makefile | 1 + arch/microblaze/kernel/ftrace.c | 10 +- arch/microblaze/kernel/intc.c | 4 +- arch/microblaze/kernel/syscall_table.S | 4 + arch/microblaze/lib/Makefile | 6 + arch/mn10300/Kconfig | 1 - arch/parisc/Kconfig | 1 - arch/powerpc/Kconfig | 1 - arch/powerpc/configs/44x/warp_defconfig | 1 + arch/powerpc/configs/52xx/motionpro_defconfig | 1 + arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 1 + arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1 + arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 + arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 1 + arch/powerpc/configs/e55xx_smp_defconfig | 1 + arch/powerpc/configs/linkstation_defconfig | 1 + arch/powerpc/configs/mpc512x_defconfig | 1 + arch/powerpc/configs/mpc5200_defconfig | 1 + arch/powerpc/configs/mpc85xx_defconfig | 1 + arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + arch/powerpc/configs/mpc86xx_defconfig | 1 + arch/powerpc/configs/pasemi_defconfig | 1 + arch/powerpc/configs/ppc6xx_defconfig | 1 + arch/powerpc/configs/pseries_defconfig | 3 + arch/powerpc/include/asm/dma-mapping.h | 6 + arch/powerpc/include/asm/machdep.h | 3 +- arch/powerpc/include/asm/mmu-hash64.h | 2 +- arch/powerpc/include/asm/page.h | 2 +- arch/powerpc/include/asm/qe_ic.h | 16 +- arch/powerpc/include/asm/reg_booke.h | 2 +- arch/powerpc/include/asm/smp.h | 5 +- arch/powerpc/include/asm/systbl.h | 4 + arch/powerpc/include/asm/unistd.h | 6 +- arch/powerpc/kernel/dma.c | 18 + arch/powerpc/kernel/exceptions-64s.S | 28 +- arch/powerpc/kernel/head_32.S | 9 + arch/powerpc/kernel/head_64.S | 7 + arch/powerpc/kernel/idle_power4.S | 21 -- arch/powerpc/kernel/irq.c | 3 +- arch/powerpc/kernel/smp.c | 153 ++++++---- arch/powerpc/kernel/time.c | 17 +- arch/powerpc/mm/dma-noncoherent.c | 20 ++ arch/powerpc/mm/tlb_low_64e.S | 2 +- arch/powerpc/platforms/Kconfig | 2 +- arch/powerpc/platforms/cell/interrupt.c | 2 +- arch/powerpc/platforms/powermac/pmac.h | 1 - arch/powerpc/platforms/powermac/setup.c | 56 ---- arch/powerpc/platforms/powermac/smp.c | 154 ++++++--- arch/powerpc/platforms/pseries/nvram.c | 24 ++ arch/powerpc/platforms/pseries/offline_states.h | 2 - arch/powerpc/platforms/pseries/smp.c | 4 +- arch/powerpc/platforms/pseries/xics.c | 71 ++-- arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- arch/score/Kconfig | 1 - arch/sh/Kconfig | 1 - arch/sparc/Kconfig | 1 - arch/sparc/include/asm/unistd.h | 3 +- arch/sparc/kernel/auxio_64.c | 2 +- arch/sparc/kernel/central.c | 4 +- arch/sparc/kernel/ds.c | 2 +- arch/sparc/kernel/entry.S | 2 +- arch/sparc/kernel/mdesc.c | 2 +- arch/sparc/kernel/pci_fire.c | 2 +- arch/sparc/kernel/pci_psycho.c | 2 +- arch/sparc/kernel/pci_sabre.c | 2 +- arch/sparc/kernel/pci_schizo.c | 2 +- arch/sparc/kernel/pci_sun4v.c | 2 +- arch/sparc/kernel/power.c | 2 +- arch/sparc/kernel/systbls_32.S | 2 +- arch/sparc/kernel/systbls_64.S | 2 + arch/sparc/kernel/time_64.c | 6 +- arch/tile/Kconfig | 1 - arch/um/Kconfig.common | 1 - arch/unicore32/Kconfig | 1 - arch/unicore32/Makefile | 2 +- arch/unicore32/include/asm/futex.h | 143 -------- arch/unicore32/include/mach/PKUnity.h | 10 - arch/unicore32/include/mach/memory.h | 1 - arch/unicore32/kernel/puv3-core.c | 5 - arch/unicore32/kernel/rtc.c | 9 - arch/unicore32/kernel/setup.c | 15 +- arch/unicore32/kernel/traps.c | 1 - arch/unicore32/kernel/vmlinux.lds.S | 7 +- arch/unicore32/mm/mmu.c | 20 -- arch/x86/include/asm/apic.h | 1 - arch/x86/include/asm/dma.h | 1 - arch/x86/kernel/amd_nb.c | 2 +- arch/x86/kernel/apb_timer.c | 2 +- arch/x86/kernel/apic/hw_nmi.c | 1 + arch/x86/kernel/apic/x2apic_uv_x.c | 10 + arch/x86/kernel/cpu/mcheck/mce.c | 2 +- arch/x86/kernel/cpu/mtrr/main.c | 20 +- arch/x86/kernel/irq.c | 1 + arch/x86/kernel/microcode_core.c | 1 + arch/x86/kernel/reboot.c | 1 + arch/x86/oprofile/nmi_int.c | 5 + arch/x86/oprofile/op_counter.h | 1 + arch/x86/platform/uv/tlb_uv.c | 1 + arch/xtensa/Kconfig | 1 - block/blk-core.c | 4 +- block/blk-flush.c | 6 +- block/blk-integrity.c | 12 +- block/blk-throttle.c | 4 +- block/elevator.c | 35 +-- drivers/ata/pata_palmld.c | 43 ++-- drivers/atm/solos-pci.c | 39 +-- drivers/connector/cn_queue.c | 58 +--- drivers/connector/connector.c | 47 +-- drivers/gpu/drm/drm_edid.c | 3 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 25 ++- drivers/gpu/drm/i915/intel_lvds.c | 10 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 20 ++ drivers/gpu/drm/radeon/evergreen.c | 11 - drivers/gpu/drm/radeon/radeon_atombios.c | 13 +- drivers/gpu/drm/radeon/radeon_combios.c | 13 + drivers/gpu/drm/radeon/rs600.c | 11 - drivers/gpu/drm/ttm/ttm_bo.c | 10 +- drivers/gpu/drm/ttm/ttm_tt.c | 16 +- drivers/hwmon/twl4030-madc-hwmon.c | 2 +- drivers/ide/ide-io.c | 43 ++-- drivers/macintosh/therm_pm72.c | 60 ++-- drivers/md/dm-table.c | 114 +++++-- drivers/media/radio/wl128x/fmdrv_common.c | 16 +- drivers/media/rc/ite-cir.c | 1 + drivers/net/atlx/atl2.c | 22 +- drivers/net/bonding/bond_alb.h | 2 +- drivers/net/irda/via-ircc.c | 94 ++---- drivers/net/mlx4/eq.c | 4 +- drivers/net/mlx4/mcg.c | 3 +- drivers/net/phy/phy_device.c | 8 +- drivers/net/usb/Kconfig | 15 + drivers/net/usb/Makefile | 1 + drivers/net/usb/cdc_ether.c | 21 +- drivers/net/usb/lg-vl600.c | 346 ++++++++++++++++++++ drivers/net/usb/usbnet.c | 10 +- drivers/pcmcia/pxa2xx_colibri.c | 133 +++----- drivers/pcmcia/pxa2xx_palmld.c | 42 +-- drivers/pcmcia/pxa2xx_palmtc.c | 75 +---- drivers/pcmcia/pxa2xx_palmtx.c | 57 +--- drivers/pcmcia/pxa2xx_vpac270.c | 110 ++----- drivers/rtc/rtc-mrst.c | 10 +- drivers/scsi/ultrastor.c | 1 + drivers/sh/intc/internals.h | 4 +- drivers/staging/altera-stapl/altera-jtag.c | 1 + drivers/tty/n_tty.c | 6 + drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/apbuart.c | 34 +-- drivers/tty/tty_buffer.c | 4 +- drivers/usb/gadget/pxa25x_udc.c | 76 +---- drivers/usb/serial/mct_u232.c | 4 +- drivers/usb/serial/opticon.c | 2 +- drivers/video/fb-puv3.c | 28 +- drivers/video/pxafb.c | 136 +++++--- drivers/video/pxafb.h | 3 +- fs/ceph/mds_client.c | 6 + fs/ceph/super.c | 2 +- fs/inode.c | 9 +- fs/nilfs2/file.c | 11 +- fs/nilfs2/nilfs.h | 14 +- fs/nilfs2/page.c | 2 +- fs/ubifs/xattr.c | 4 +- fs/ufs/truncate.c | 1 - include/asm-generic/bug.h | 7 + include/drm/drm_crtc.h | 1 + include/drm/drm_pciids.h | 2 + include/drm/ttm/ttm_bo_api.h | 18 +- include/drm/ttm/ttm_bo_driver.h | 4 +- include/keys/ceph-type.h | 8 + include/linux/atmdev.h | 1 + include/linux/blkdev.h | 2 + include/linux/ceph/auth.h | 4 +- include/linux/ceph/libceph.h | 2 +- include/linux/connector.h | 16 +- include/linux/elevator.h | 1 - include/linux/fs.h | 2 + include/linux/interrupt.h | 8 - include/linux/irq.h | 7 - include/linux/kexec.h | 1 + include/linux/pci_ids.h | 2 +- include/linux/perf_event.h | 2 +- include/linux/rcupdate.h | 20 ++ include/linux/skbuff.h | 2 +- include/linux/usb/usbnet.h | 3 + include/net/if_inet6.h | 16 + include/net/ip.h | 8 + include/sound/soc-dapm.h | 16 +- kernel/irq/Kconfig | 3 - kernel/irq/chip.c | 2 +- kernel/kexec.c | 5 +- kernel/perf_event.c | 9 +- kernel/sched.c | 11 + kernel/sched_fair.c | 5 +- kernel/signal.c | 153 +++++++--- kernel/time/ntp.c | 2 + lib/Kconfig.debug | 6 +- net/appletalk/ddp.c | 11 +- net/atm/common.c | 1 + net/bridge/br_multicast.c | 2 +- net/bridge/br_stp_if.c | 2 +- net/ceph/Kconfig | 1 + net/ceph/auth.c | 8 +- net/ceph/auth_x.c | 8 +- net/ceph/ceph_common.c | 112 ++++++- net/ceph/crypto.c | 73 ++++ net/ceph/crypto.h | 4 + net/ceph/mon_client.c | 2 +- net/ceph/osd_client.c | 12 +- net/core/dev.c | 24 ++- net/ipv4/arp.c | 3 + net/ipv4/fib_frontend.c | 2 + net/ipv6/ndisc.c | 2 + net/sctp/protocol.c | 4 +- sound/core/pcm_lib.c | 4 +- sound/firewire/speakers.c | 3 +- sound/pci/ens1370.c | 23 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 21 +- sound/soc/codecs/sn95031.c | 2 + sound/soc/codecs/tlv320dac33.c | 32 ++- sound/soc/codecs/twl6040.c | 4 +- sound/soc/imx/imx-pcm-dma-mx2.c | 9 +- sound/soc/imx/imx-ssi.h | 3 - sound/soc/pxa/corgi.c | 2 +- sound/soc/soc-jack.c | 2 +- tools/perf/Makefile | 8 +- tools/perf/builtin-record.c | 25 +- tools/perf/builtin-top.c | 44 ++- tools/perf/util/debug.c | 10 + tools/perf/util/debug.h | 1 + tools/perf/util/event.c | 2 +- tools/perf/util/setup.py | 7 +- tools/perf/util/symbol.c | 5 + 381 files changed, 3239 insertions(+), 1993 deletions(-) create mode 100644 Documentation/leds/00-INDEX rename Documentation/{ => leds}/leds-class.txt (99%) rename Documentation/{ => leds}/leds-lp3944.txt (100%) create mode 100644 arch/arm/mach-mx5/system.c create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-mmc.c delete mode 100644 arch/unicore32/include/asm/futex.h create mode 100644 drivers/net/usb/lg-vl600.c create mode 100644 include/keys/ceph-type.h ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging drivers/ide/ide-io.c CONFLICT (content): Merge conflict in drivers/ide/ide-io.c Automatic merge failed; fix conflicts and then commit the result.