1. 28 Apr, 2007 36 commits
  2. 27 Apr, 2007 4 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 94015530
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SCSI] esp_scsi.c: Fix compilation.
      94015530
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 42fae7fb
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Fix networking compilation errors
        [AF_RXRPC/AFS]: Arch-specific fixes.
        [AFS]: Fix VLocation record update wakeup
        [NET]: Revert sk_buff walker cleanups.
      42fae7fb
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · f0054636
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (46 commits)
        [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init()
        [MTD] [NAND] CM-x270 MTD driver
        [MTD] [NAND] Wrong calculation of page number in nand_block_bad()
        [MTD] [MAPS] fix plat-ram printk format
        [JFFS2] Fix compr_rubin.c build after include file elimination.
        [JFFS2] Handle inodes with only a single metadata node with non-zero isize
        [JFFS2] Tidy up licensing/copyright boilerplate.
        [MTD] [OneNAND] Exit loop only when column start with 0
        [MTD] [OneNAND] Fix access the past of the real oobfree array
        [MTD] [OneNAND] Update Samsung OneNAND official URL
        [JFFS2] Better fix for all-zero node headers
        [JFFS2] Improve read_inode memory usage, v2.
        [JFFS2] Improve failure mode if inode checking leaves unchecked space.
        [JFFS2] Fix cross-endian build.
        [MTD] Finish conversion mtd_blkdevs to use the kthread API
        [JFFS2] Obsolete dirent nodes immediately on unlink, where possible.
        Use menuconfig objects: MTD
        [MTD] mtd_blkdevs: Convert to use the kthread API
        [MTD] Fix fwh_lock locking
        [JFFS2] Speed up mount for directly-mapped NOR flash
        ...
      f0054636
    • Adrian Bunk's avatar
      [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init() · 28b57cdd
      Adrian Bunk authored
      This patch converts the pci_module_init() usage to pci_register_driver().
      
      It's currently #if 0'ed, but still not a bad idea to change it.
      Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
      28b57cdd