1. 19 Jun, 2009 35 commits
  2. 18 Jun, 2009 5 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
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · d2aa4550
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits)
        netxen: fix tx ring accounting
        netxen: fix detection of cut-thru firmware mode
        forcedeth: fix dma api mismatches
        atm: sk_wmem_alloc initial value is one
        net: correct off-by-one write allocations reports
        via-velocity : fix no link detection on boot
        Net / e100: Fix suspend of devices that cannot be power managed
        TI DaVinci EMAC : Fix rmmod error
        net: group address list and its count
        ipv4: Fix fib_trie rebalancing, part 2
        pkt_sched: Update drops stats in act_police
        sky2: version 1.23
        sky2: add GRO support
        sky2: skb recycling
        sky2: reduce default transmit ring
        sky2: receive counter update
        sky2: fix shutdown synchronization
        sky2: PCI irq issues
        sky2: more receive shutdown
        sky2: turn off pause during shutdown
        ...
      
      Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck
      d2aa4550
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 9e3e4b1d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] hpwdt: Add NMI sourcing
        [WATCHDOG] iTCO_wdt: Fix ICH7+ reboot issue.
        [WATCHDOG] iTCO_wdt: fix memory corruption when RCBA is disabled by hardware
        [WATCHDOG] Correct WDIOF_MAGICCLOSE flag
        [WATCHDOG] move platform probe and remove function to devinit and devexit
        [WATCHDOG] Some more general cleanup
        [WATCHDOG] iTCO_wdt: Cleanup code
      9e3e4b1d
    • Benjamin Herrenschmidt's avatar
      mm: Extend gfp masking to the page allocator · dcce284a
      Benjamin Herrenschmidt authored
      The page allocator also needs the masking of gfp flags during boot,
      so this moves it out of slab/slub and uses it with the page allocator
      as well.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dcce284a