1. 19 Jun, 2009 38 commits
  2. 18 Jun, 2009 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 0732f877
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        jbd2: clean up jbd2_journal_try_to_free_buffers()
        ext4: Don't update ctime for non-extent-mapped inodes
        ext4: Fix up whitespace issues in fs/ext4/inode.c
        ext4: Fix 64-bit block type problem on 32-bit platforms
        ext4: teach the inode allocator to use a goal inode number
        ext4: Use a hash of the topdir directory name for the Orlov parent group
        ext4: document the "abort" mount option
        ext4: move the abort flag from s_mount_opts to s_mount_flags
        ext4: update the s_last_mounted field in the superblock
        ext4: change s_mount_opt to be an unsigned int
        ext4: online defrag -- Add EXT4_IOC_MOVE_EXT ioctl
        ext4: avoid unnecessary spinlock in critical POSIX ACL path
        ext3: avoid unnecessary spinlock in critical POSIX ACL path
        ext4: convert instrumentation from markers to tracepoints
        jbd2: convert instrumentation from markers to tracepoints
      0732f877
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 15fc204a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits)
        sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
        sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
        sh: remove stray markers.
        sh: defconfig updates.
        sh: pci: Initial PCI-Express support for SH7786 Urquell board.
        sh: Generic HAVE_PERF_COUNTER support.
        SH: convert migor to soc-camera as platform-device
        SH: convert ap325rxa to soc-camera as platform-device
        soc-camera: unify i2c camera device platform data
        sh: add platform data for r8a66597-hcd in setup-sh7723
        sh: add platform data for r8a66597-hcd in setup-sh7366
        sh: x3proto: add platform data for r8a66597-hcd
        sh: highlander: add platform data for r8a66597-hcd
        sh: sh7785lcr: add platform data for r8a66597-hcd
        sh: turn off irqs when disabling CMT/TMU timers
        sh: use kzalloc() for cpg clocks
        sh: unbreak WARN_ON()
        sh: Use generic atomic64_t implementation.
        sh: Revised clock function in highlander
        sh: Update r7780mp defconfig
        ...
      15fc204a