1. 16 Oct, 2008 14 commits
  2. 15 Oct, 2008 21 commits
  3. 14 Oct, 2008 5 commits
    • Mark Fasheh's avatar
      ocfs2: fix build error · 1efd47f8
      Mark Fasheh authored
      I merged the latest ocfs2_read_blocks() changes in xattr.c wrong. This makes
      Ocfs2 compile again.
      Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
    • Benjamin Herrenschmidt's avatar
      Merge commit 'origin' · 6dc64725
      Benjamin Herrenschmidt authored
      Manual fixup of conflicts on:
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 278429cf
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c-viapro: Add support for SMBus Process Call transactions
        i2c: Restore i2c_smbus_process_call function
        i2c: Do earlier driver model init
        i2c: Only build Tyan SMBus mux drivers on x86
        i2c: Guard against oopses from bad init sequences
        i2c: Document the implementation details of the /dev interface
        i2c: Improve dev-interface documentation
        i2c-parport-light: Don't register a platform device resource
        hwmon: (dme1737) Convert to a new-style i2c driver
        hwmon: (dme1737) Be less i2c-centric
        i2c/tps65010: Vibrator hookup to gpiolib
        i2c-viapro: Add VX800/VX820 support
        i2c: Renesas Highlander FPGA SMBus support
        i2c-pca-isa: Don't grab arbitrary resources
        i2c/isp1301_omap: Convert to a new-style i2c driver, part 2
        i2c/isp1301_omap: Convert to a new-style i2c driver, part 1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · e413b210
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)
        HID: build drivers for all quirky devices by default
        HID: add missing blacklist entry for Apple ATV ircontrol
        HID: add support for Bright ABNT2 brazilian device
        HID: Don't let Avermedia Radio FM800 be handled by usb hid drivers
        HID: fix numlock led on Dell device 0x413c/0x2105
        HID: remove warn() macro from usb hid drivers
        HID: remove info() macro from usb HID drivers
        HID: add appletv IR receiver quirk
        HID: fix a lockup regression when using force feedback on a PID device
        HID: hiddev.h: Fix example code.
        HID: hiddev.h: Fix mixed space and tabs in example code.
        HID: convert to dev_* prints
        HID: remove hid-ff
        HID: move zeroplus FF processing
        HID: move thrustmaster FF processing
        HID: move pantherlord FF processing
        HID: fix incorrent length condition in hidraw_write()
        HID: fix tty<->hid deadlock
        HID: ignore iBuddy devices
        HID: report descriptor fix for remaining MacBook JIS keyboards
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · acd15a83
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits)
        ocfs2: Make cached block reads the common case.
        ocfs2: Kill the last naked wait_on_buffer() for cached reads.
        ocfs2: Move ocfs2_bread() into dir.c
        ocfs2: Simplify ocfs2_read_block()
        ocfs2: Require an inode for ocfs2_read_block(s)().
        ocfs2: Separate out sync reads from ocfs2_read_blocks()
        ocfs2: Refactor xattr list and remove ocfs2_xattr_handler().
        ocfs2: Calculate EA hash only by its suffix.
        ocfs2: Move trusted and user attribute support into xattr.c
        ocfs2: Uninline ocfs2_xattr_name_hash()
        ocfs2: Don't check for NULL before brelse()
        ocfs2: use smaller counters in ocfs2_remove_xattr_clusters_from_cache
        ocfs2: Documentation update for user_xattr / nouser_xattr mount options
        ocfs2: make la_debug_mutex static
        ocfs2: Remove pointless !!
        ocfs2: Add empty bucket support in xattr.
        ocfs2/xattr.c: Fix a bug when inserting xattr.
        ocfs2: Add xattr mount option in ocfs2_show_options()
        ocfs2: Switch over to JBD2.
        ocfs2: Add the 'inode64' mount option.