1. 22 Apr, 2008 35 commits
  2. 21 Apr, 2008 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial · e9b62693
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
        DOC:  A couple corrections and clarifications in USB doc.
        Generate a slightly more informative error msg for bad HZ
        fix typo "is" -> "if" in Makefile
        ext*: spelling fix prefered -> preferred
        DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
        KEYS:  Fix the comment to match the file name in rxrpc-type.h.
        RAID: remove trailing space from printk line
        DMA engine: typo fixes
        Remove unused MAX_NODES_SHIFT
        MAINTAINERS: Clarify access to OCFS2 development mailing list.
        V4L: Storage class should be before const qualifier (sn9c102)
        V4L: Storage class should be before const qualifier
        sonypi: Storage class should be before const qualifier
        intel_menlow: Storage class should be before const qualifier
        DVB: Storage class should be before const qualifier
        arm: Storage class should be before const qualifier
        ALSA: Storage class should be before const qualifier
        acpi: Storage class should be before const qualifier
        firmware_sample_driver.c: fix coding style
        MAINTAINERS: Add ati_remote2 driver
        ...
      
      Fixed up trivial conflicts in firmware_sample_driver.c
      e9b62693
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block · 548453fd
      Linus Torvalds authored
      * 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block:
        block: fix blk_register_queue() return value
        block: fix memory hotplug and bouncing in block layer
        block: replace remaining __FUNCTION__ occurrences
        Kconfig: clean up block/Kconfig help descriptions
        cciss: fix warning oops on rmmod of driver
        cciss: Fix race between disk-adding code and interrupt handler
        block: move the padding adjustment to blk_rq_map_sg
        block: add bio_copy_user_iov support to blk_rq_map_user_iov
        block: convert bio_copy_user to bio_copy_user_iov
        loop: manage partitions in disk image
        cdrom: use kmalloced buffers instead of buffers on stack
        cdrom: make unregister_cdrom() return void
        cdrom: use list_head for cdrom_device_info list
        cdrom: protect cdrom_device_info list by mutex
        cdrom: cleanup hardcoded error-code
        cdrom: remove ifdef CONFIG_SYSCTL
      548453fd
    • Adrian Bunk's avatar
      frv: unexport kmap_atomic_to_page · 9fd91217
      Adrian Bunk authored
      This patch removes the no longer used export of kmap_atomic_to_page.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9fd91217
    • Adrian Bunk's avatar
      frv: remove HARD_RESET_NOW() · eb0cc5fe
      Adrian Bunk authored
      HARD_RESET_NOW() was unused.
      
      And one of the few remaining cli() users.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      eb0cc5fe
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 · 19b5b517
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
        SELinux: one little, two little, three little whitespaces, the avc.c saga.
        SELinux: cleanup on isle selinuxfs.c
        changing whitespace for fun and profit: policydb.c
        SELinux: whitespace and formating fixes for hooks.c
        SELinux: clean up printks
        SELinux: sidtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: services.c whitespace, syntax, and static declaraction cleanups
        SELinux: mls.c whitespace, syntax, and static declaraction cleanups
        SELinux: hashtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: ebitmap.c whitespace, syntax, and static declaraction cleanups
        SELinux: conditional.c whitespace, syntax, and static declaraction cleanups
        SELinux: avtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: xfrm.c whitespace, syntax, and static declaraction cleanups
        SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups
        SELinux: netnode.c whitespace, syntax, and static declaraction cleanups
        SELinux: netlink.c whitespace, syntax, and static declaraction cleanups
        SELinux: netlabel.c whitespace, syntax, and static declaraction cleanups
        SELinux: netif.c whitespace, syntax, and static declaraction cleanups
      19b5b517