1. 17 Nov, 2011 2 commits
  2. 10 Nov, 2011 1 commit
  3. 08 Nov, 2011 2 commits
  4. 03 Nov, 2011 4 commits
  5. 01 Nov, 2011 2 commits
  6. 28 Oct, 2011 15 commits
  7. 27 Oct, 2011 10 commits
    • Dave Airlie's avatar
      Revert "drm/ttm: add a way to bo_wait for either the last read or last write" · 1717c0e2
      Dave Airlie authored
      This reverts commit dfadbbdb.
      
      Further upstream discussion between Marek and Thomas decided this wasn't
      fully baked and needed further work, so revert it before it hits mainline.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      1717c0e2
    • Dave Airlie's avatar
      Revert "drm/radeon/kms: add a new gem_wait ioctl with read/write flags" · 83f30d0e
      Dave Airlie authored
      This reverts commit d3ed7402.
      
      Further upstream discussion between Thomas and Marek decided this needed
      more work and driver specifics. So revert before it goes upstream.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      83f30d0e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 396e6e49
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (68 commits)
        Input: adp5589-keys - add support for the ADP5585 derivatives
        Input: imx_keypad - add pm suspend and resume support
        Input: force feedback - potential integer wrap in input_ff_create()
        Input: tsc2007 - make sure that X plate resistance is specified
        Input: serio_raw - fix memory leak when closing char device
        Input: serio_raw - kick clients when disconnecting port
        Input: serio_raw - explicitly mark disconnected ports as dead
        Input: serio_raw - fix coding style issues
        Input: serio_raw - use dev_*() for messages
        Input: serio_raw - use bool for boolean data
        Input: serio_raw - perform proper locking when adding clients to list
        Input: serio_raw - rename serio_raw_list to serio_raw_client
        Input: serio_raw - use kref instead of rolling out its own refcounting
        Input: psmouse - switch to using dev_*() for messages
        Input: wacom - correct max Y value on medium bamboos
        Input: wacom - add ABS_DISTANCE to Bamboo Pen reports
        Input: wacom - remove unneeded touch pressure initialization
        Input: lm8323 - wrap suspend and resume in CONFIG_PM_SLEEP
        Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP
        Input: synaptics_i2c - wrap suspend and resume in CONFIG_PM_SLEEP
        ...
      396e6e49
    • Linus Torvalds's avatar
      Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 18974369
      Linus Torvalds authored
      * 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: 7131/1: clkdev: Add Common Macro for clk_lookup
        clk: spi-pl022: convert to clk_prepare()/clk_unprepare()
        clk: timer-sp: convert to clk_prepare()/clk_unprepare()
        clk: sa1111: convert to clk_prepare()/clk_unprepare()
        clk: mmci: convert to clk_prepare()/clk_unprepare()
        clk: amba-pl011: convert to clk_prepare()/clk_unprepare()
        clk: amba-pl010: convert to clk_prepare()/clk_unprepare()
        clk: amba-clcd: convert to clk_prepare()/clk_unprepare()
        clk: amba bus: convert to clk_prepare()/clk_unprepare()
        clk: provide prepare/unprepare functions
      18974369
    • Linus Torvalds's avatar
      Merge branch 'amba' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 7e0a6fd5
      Linus Torvalds authored
      * 'amba' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: 7079/1: spi: Fix builderror in spi-pl022.c
        PM: add runtime PM support to MMCI
        PM: add runtime PM support to core Primecell driver
      7e0a6fd5
    • Linus Torvalds's avatar
      Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · ca906662
      Linus Torvalds authored
      * 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
        ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
        ARM: 7104/1: plat-pxa: break out GPIO driver specifics
        ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
        ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
        ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
        ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
        ARM: 7083/1: rewrite U300 GPIO to use gpiolib
        ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
        ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
        ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
        ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
        ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
        ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
        ARM: 7057/1: mach-pnx4008: rename GPIO header
        ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
        ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
        ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
        ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
        ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
        ARM: 7043/1: mach-ixp2000: rename GPIO header
        ...
      
      Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
      ca906662
    • Boaz Harrosh's avatar
      fs/Makefile: Stupid typo breakage of exofs inclusion · 60325f0c
      Boaz Harrosh authored
      In my last patch I did a stupid mistake and broke the exofs
      compilation completely. Fix it ASAP.
      
      Instead of obj-y I did obj-$(y)
      
      Really Really sorry. Me totally blushing :-{|
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      60325f0c
    • Linus Torvalds's avatar
      Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 · 5fffb951
      Linus Torvalds authored
      * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
        of_mdio: Don't phy_scan_fixups() twice
        Devicetree: Expand on ARM Primecell binding documentation
        dt: Add empty of_match_node() macro
        dt: add empty dt helpers for non-dt build
        devicetree: fix build error on drivers/tty/serial/altera_jtaguart.c
        devicetree: Add ARM pl022 spi controller binding doc
        devicetree: Add ARM pl061 gpio controller binding doc
        of/irq: of_irq_find_parent: check for parent equal to child
        MAINTAINERS: update devicetree maintainers
        dt: add helper to read 64-bit integers
        tty: use of_match_ptr() for of_match_table entry
        OF: Add of_match_ptr() macro
        dt: add empty for_each_child_of_node, of_find_property
        devicetree: Document Qualcomm and Atmel prefixes
        serial/imx: add of_alias_get_id() reference back
        dt: add of_alias_scan and of_alias_get_id
        devicetree: Add a registry of vendor prefixes
      5fffb951
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev · b96d7157
      Linus Torvalds authored
      * 'upstream-linus' of git://github.com/jgarzik/libata-dev: (50 commits)
        pata_efar: fix register naming used in efar_set_piomode()
        pata_rdc: add Power Management support
        ata_piix: unify code for programming PIO and MWDMA timings
        ata_piix: SITRE handling fix
        libata: make ata_sff_data_xfer_noirq() work with 32-bit PIO
        pata_artop: add Power Management support
        pata_sl82c105: add Power Management support
        pata_pdc2027x: add Power Management support
        pata_legacy: use PIO mask defines
        pata_legacy: unify QDI ->set_piomode methods
        libata: remove no longer needed pata_qdi driver
        pata_it8213: fix register naming used in it8213_set_piomode()
        pata_it8213: add UDMA100 and UDMA133 support
        pata_rdc: parallel scanning needs an extra locking
        pata_via: add via_fixup()
        libata: ata_timing_compute() fixup
        pata_scc: add proper cable detection method
        pata_arasan_cf: remove bogus to_platform_device() calls
        pata_atiixp: add proper ->prereset method
        pata_serverworks: add serverworks_fixup()
        ...
      b96d7157
    • Dmitry Torokhov's avatar
      Merge branch 'next' into for-linus · 6ad390a2
      Dmitry Torokhov authored
      6ad390a2
  8. 26 Oct, 2011 4 commits
    • Linus Torvalds's avatar
      Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 138c4ae9
      Linus Torvalds authored
      * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
        tools, slub: Fix off-by-one buffer corruption after readlink() call
        slub: Discard slab page when node partial > minimum partial number
        slub: correct comments error for per cpu partial
        mm: restrict access to slab files under procfs and sysfs
        slub: Code optimization in get_partial_node()
        slub: doc: update the slabinfo.c file path
        slub: explicitly document position of inserting slab to partial list
        slub: update slabinfo tools to report per cpu partial list statistics
        slub: per cpu cache for partial pages
        slub: return object pointer from get_partial() / new_slab().
        slub: pass kmem_cache_cpu pointer to get_partial()
        slub: Prepare inuse field in new_slab()
        slub: Remove useless statements in __slab_alloc
        slub: free slabs without holding locks
        slub: use print_hex_dump
        slab: use print_hex_dump
      138c4ae9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 3b3dd79d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: irq: remove IRQF_DISABLED
        Blackfin: boards: clean up i2c_board_info
        Blackfin: drop unused Kconfig symbol
        Blackfin: bf537-stamp: register ASoC EVAL-ADAU1373 board driver
        Blackfin: bf537-stamp: Register adav801 codec and ASoC machine driver
        Blackfin: bf537-stamp: register adau1701 codec and asoc machine driver
        Blackfin: merge asm/mutex.h into kbuild too
        Blackfin: bf537-stamp: fix ad73311 codec config macro
        Blackfin: bf537-stamp: fix ad1836 name
        Blackfin: kgdb_test: rework code to avoid -O0 usage
        Blackfin: fix sparse warnings in copy_to/from_user
        Blackfin: bf548-ezkit: update defconfig
        Blackfin: SMP: fix scheduling deadlock
        Blackfin: H8606: fixup bogus ioresource init
        Blackfin: SMP: convert to common asm-generic/atomic.h
      3b3dd79d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · c3ae1f33
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md: (34 commits)
        md: Fix some bugs in recovery_disabled handling.
        md/raid5: fix bug that could result in reads from a failed device.
        lib/raid6: Fix filename emitted in generated code
        md.c: trivial comment fix
        MD: Allow restarting an interrupted incremental recovery.
        md: clear In_sync bit on devices added to an active array.
        md: add proper write-congestion reporting to RAID1 and RAID10.
        md: rename "mdk_personality" to "md_personality"
        md/bitmap remove fault injection options.
        md/raid5: typedef removal: raid5_conf_t -> struct r5conf
        md/raid1: typedef removal: conf_t -> struct r1conf
        md/raid10: typedef removal: conf_t -> struct r10conf
        md/raid0: typedef removal: raid0_conf_t -> struct r0conf
        md/multipath: typedef removal: multipath_conf_t -> struct mpconf
        md/linear: typedef removal: linear_conf_t -> struct linear_conf
        md/faulty: remove typedef: conf_t -> struct faulty_conf
        md/linear: remove typedefs: dev_info_t -> struct dev_info
        md: remove typedefs: mirror_info_t -> struct mirror_info
        md: remove typedefs: r10bio_t -> struct r10bio and r1bio_t -> struct r1bio
        md: remove typedefs: mdk_thread_t -> struct md_thread
        ...
      c3ae1f33
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · c28cfd60
      Linus Torvalds authored
      * 'for-linus' of git://git.open-osd.org/linux-open-osd: (21 commits)
        ore: Enable RAID5 mounts
        exofs: Support for RAID5 read-4-write interface.
        ore: RAID5 Write
        ore: RAID5 read
        fs/Makefile: Always inspect exofs/
        ore: Make ore_calc_stripe_info EXPORT_SYMBOL
        ore/exofs: Change ore_check_io API
        ore/exofs: Define new ore_verify_layout
        ore: Support for partial component table
        ore: Support for short read/writes
        exofs: Support for short read/writes
        ore: Remove check for ios->kern_buff in _prepare_for_striping to later
        ore: cleanup: Embed an ore_striping_info inside ore_io_state
        ore: Only IO one group at a time (API change)
        ore/exofs: Change the type of the devices array (API change)
        ore: Make ore_striping_info and ore_calc_stripe_info public
        exofs: Remove unused data_map member from exofs_sb_info
        exofs: Rename struct ore_components comps => oc
        exofs/super.c: local functions should be static
        exofs/ore.c: local functions should be static
        ...
      c28cfd60