1. 16 8月, 2008 6 次提交
    • A
      tty: remove resize window special case · 8c9a9dd0
      Alan Cox 提交于
      This moves it to being a tty operation. That removes special cases and now
      also means that resize can be picked up by um and other non vt consoles
      which may have a resize operation.
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8c9a9dd0
    • L
      Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6 · 21d3bdb1
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6: (29 commits)
        UBIFS: xattr bugfixes
        UBIFS: remove unneeded check
        UBIFS: few commentary fixes
        UBIFS: fix budgeting request alignment in xattr code
        UBIFS: improve arguments checking in debugging messages
        UBIFS: always set i_generation to 0
        UBIFS: correct spelling of "thrice".
        UBIFS: support splice_write
        UBIFS: minor tweaks in commit
        UBIFS: reserve more space for index
        UBIFS: print pid in dump function
        UBIFS: align inode data to eight
        UBIFS: improve budgeting checks
        UBIFS: correct orphan deletion order
        UBIFS: fix typos in comments
        UBIFS: do not union creat_sqnum and del_cmtno
        UBIFS: optimize deletions
        UBIFS: increment commit number earlier
        UBIFS: remove another unneeded function parameter
        UBIFS: remove unneeded function parameter
        ...
      21d3bdb1
    • L
      Merge branch 'for-linus' of git://neil.brown.name/md · 3141eb6c
      Linus Torvalds 提交于
      * 'for-linus' of git://neil.brown.name/md:
        md: cancel check/repair requests when recovery is needed
        Allow raid10 resync to happening in larger chunks.
        Allow faulty devices to be removed from a readonly array.
        Don't let a blocked_rdev interfere with read request in raid5/6
        Fail safely when trying to grow an array with a write-intent bitmap.
        Restore force switch of md array to readonly at reboot time.
        Make writes to md/safe_mode_delay immediately effective.
      3141eb6c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 7db9cbb3
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: xilinx_ps2 - fix warning
        Input: bcm5974 - implement autosuspend support
        Input: bcm5974 - add driver for Macbook Air and Pro Penryn touchpads
        Input: paper over a bug in Synaptics X driver
        Input: evdev - split EVIOCGBIT handlig into a separate function
        Input: i8042 - Add Dritek quirk for Acer TravelMate 4280
        Input: xpad - add Pelican Eclipse D-Pad to the list of devices
        Input: gpio-keys - make gpio_keys_device_driver static
        Input: gpio-keys - fix possible NULL pointer dereference
        Input: wm97xx - enable sub-drivers by default
      7db9cbb3
    • L
      Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6 · ffaa5b98
      Linus Torvalds 提交于
      * 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6:
        ACPI: Fix thermal shutdowns
        ACPI: bounds check IRQ to prevent memory corruption
        ACPI: Avoid bogus EC timeout when EC is in Polling mode
        ACPI : Add the EC dmi table to fix the incorrect ECDT table
        ACPI: Properly clear flags on false-positives and send uevent on sudden unplug
        acpi: trivial cleanups
        acer-wmi: Fix wireless and bluetooth on early AMW0 v2 laptops
        ACPI: WMI: Set instance for query block calls
        ACPICA: Additional error checking for pathname utilities
        ACPICA: Fix possible memory leak in Unload() operator
        ACPICA: Fix memory leak when deleting thermal/processor objects
      ffaa5b98
    • L
      alpha: move include/asm-alpha to arch/alpha/include/asm · 024b246e
      Linus Torvalds 提交于
      Sam Ravnborg did the build-test that the direct header file move works,
      I'm just committing it.
      
      This is a pure move:
      
      	mkdir arch/alpha/include
      	git mv include/asm-alpha arch/alpha/include/asm
      
      with no other changes.
      Requested-and-tested-by: NSam Ravnborg <sam@ravnborg.org>
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      024b246e
  2. 15 8月, 2008 34 次提交