commit aab2545fdd6641b76af0ae96456c4ca9d1e50dad
Author: Oleg Nesterov <oleg@tv-sign.ru>
Date:   Fri Jun 6 11:31:39 2008 -0700

    uml: activate_mm: remove the dead PF_BORROWED_MM check
    
    use_mm() was changed to use switch_mm() instead of activate_mm(), since
    then nobody calls (and nobody should call) activate_mm() with
    PF_BORROWED_MM bit set.
    
    As Jeff Dike pointed out, we can also remove the "old != new" check, it is
    always true.
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 06a1578e2448112d6f635b1a458a65e36f0f97c6
Merge: 256a13d... 27676a3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 6 11:33:30 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/ipath: Fix SM trap forwarding
      IB/ehca: Reject send WRs only for RESET, INIT and RTR state
      MAINTAINERS: Update NetEffect (iw_nes) entry
      IB/ipath: Fix device capability flags
      IB/ipath: Avoid test_bit() on u64 SDMA status value

commit 256a13dd708004082a2de0938fd614b155c259e2
Merge: 330bcd2... 9f67fd5...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 6 11:33:08 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
      PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

commit 330bcd2f7bd1e2e66d54bf95adca0795b262469f
Merge: 156a9ea... 868e15db...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 6 11:32:37 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card

commit 156a9ea43acb609ac89d48dbb9f0d05ee903a12e
Merge: c8d10bf... ca05a99...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 6 11:31:55 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6:
      capabilities: remain source compatible with 32-bit raw legacy capability support.
      LSM: remove stale web site from MAINTAINERS

commit c8d10bffdbea5f82a8e491467a23fb2cc7da921b
Merge: eb4e545... bc01886...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jun 6 11:31:18 2008 -0700

    Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
    
    * git://git.infradead.org/~dwmw2/mtd-2.6.26:
      [MTD] m25p80.c mutex unlock fix

commit eb4e545d4ac82d9018487edb4419b33b9930c857
Author: David Sterba <dsterba@suse.cz>
Date:   Fri Jun 6 10:56:35 2008 +0200

    ipwireless: Fix blocked sending
    
    Packet sending is driven by two flags, tx_ready and tx_queued.
    It was possible, that there were queued data for sending and
    hardware was flagged as blocked but in fact it was not.
    
    The tx_queued was indicator but should be really a counter else
    first fragmented packet resets tx_queued flag, but there may be
    pending packets which do not get sent.
    
    New semantics:
    tx_ready - set, if hw is ready to send packet, no packet is being
               transferred right now
               set the flag right at the place where data are copied
               into hw memory and not earlier without checking if it
               was succesful
    tx_queued - count of enqueued packets, including fragments
    
    Tested-by: Michal Rokos <michal.rokos@gmail.com>
    Signed-off-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 979b0fea2d9ae5d57237a368d571cbc84655fba6
Author: Jeff Layton <jlayton@redhat.com>
Date:   Thu Jun 5 22:47:00 2008 -0700

    vm: add kzalloc_node() inline
    
    To get zeroed out memory from a particular NUMA node.  To be used by
    sunrpc.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Cc: Christoph Lameter <clameter@sgi.com>
    Cc: Pekka Enberg <penberg@cs.helsinki.fi>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ef421be741a3e56cb89088a7dd4f73cc38739d1b
Author: Thomas Tuttle <ttuttle@google.com>
Date:   Thu Jun 5 22:46:59 2008 -0700

    pagemap: add documentation for pagemap
    
    Just a quick explanation of the pagemap interface from a userspace point
    of view, and an example of how to use it (in English, not code).
    
    Signed-off-by: Thomas  Tuttle <ttuttle@google.com>
    Cc: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4710d1ac4c491dd8a28f57946214c0b5fe73cc87
Author: Thomas Tuttle <ttuttle@google.com>
Date:   Thu Jun 5 22:46:58 2008 -0700

    pagemap: return EINVAL, not EIO, for unaligned reads of kpagecount or kpageflags
    
    If the user tries to read from a position that is not a multiple of 8, or
    read a number of bytes that is not a multiple of 8, they have passed an
    invalid argument to read, for the purpose of reading these files.  It's
    not an IO error because we didn't encounter any trouble finding the data
    they asked for.
    
    Signed-off-by: Thomas Tuttle <ttuttle@google.com>
    Cc: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bbcdac0c20aa20d1daad41d9c138102b70e5aae4
Author: Thomas Tuttle <ttuttle@google.com>
Date:   Thu Jun 5 22:46:58 2008 -0700

    pagemap: return map count, not reference count, in /proc/kpagecount
    
    Since pagemap is all about examining pages mapped into processes' memory
    spaces, it makes sense for kpagecount to return the map counts, not the
    reference counts.
    
    Signed-off-by: Thomas Tuttle <ttuttle@google.com>
    Cc: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a4fa7ef037b17f2a3b9b393cb924e571fc04e784
Author: Tim Gardner <tim.gardner@canonical.com>
Date:   Thu Jun 5 22:46:55 2008 -0700

    hdaps: fix module loading on Thinkpad T61P
    
    Adds DMI system identifier for ThinkPad T61.
    
    Originally written by Klaus S. Madsen.
    
    Taken from http://launchpadlibrarian.net/10864950/hdaps-t61.patch
    
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
    Signed-off-by: maximilian attems <max@stro.at>
    Cc: Klaus S. Madsen <ubuntu@hjernemadsen.org>
    Cc: Mark M. Hoffman <mhoffman@lightlink.com>
    Cc: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit aed5417593ad125283f35513573282139a8664b5
Author: Vegard Nossum <vegard.nossum@gmail.com>
Date:   Thu Jun 5 22:46:53 2008 -0700

    proc: calculate the correct /proc/<pid> link count
    
    This patch:
    
      commit e9720acd728a46cb40daa52c99a979f7c4ff195c
      Author: Pavel Emelyanov <xemul@openvz.org>
      Date:   Fri Mar 7 11:08:40 2008 -0800
    
        [NET]: Make /proc/net a symlink on /proc/self/net (v3)
    
    introduced a /proc/self/net directory without bumping the corresponding
    link count for /proc/self.
    
    This patch replaces the static link count initializations with a call that
    counts the number of directory entries in the given pid_entry table
    whenever it is instantiated, and thus relieves the burden of manually
    keeping the two in sync.
    
    [akpm@linux-foundation.org: cleanup]
    Acked-by: Eric W. Biederman <ebiederm@xmission.com>
    Cc: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit aabe188565124ee2ed060a072764d6ed34dfa4ed
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Thu Jun 5 22:46:50 2008 -0700

    rtc: class driver for ppc_md RTC functions
    
    This hooks up the platform-specific [gs]et_rtc_time functions so that
    kernels using CONFIG_RTC_CLASS have RTC support on most PowerPC platforms.
    
    A new driver, and one which we've been shipping in Fedora for a while
    already, since otherwise RTC support breaks.
    
    [akpm@linux-foundation.org: fix Kconfig indenting]
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Acked-by: Alessandro Zummo <a.zummo@towertech.it>
    Acked-by: David Brownell <david-b@pacbell.net>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ec0ced156f930aba24e7527905de294ad929ef65
Author: Adrian Bunk <adrian.bunk@movial.fi>
Date:   Thu Jun 5 22:46:48 2008 -0700

    asm-m32r/uaccess.h must #include <asm/setup.h>
    
    This patch fixes the following compile error caused by
    commit 4016a1390d07f15b267eecb20e76a48fd5c524ef
    (mm/nommu.c: return 0 from kobjsize with invalid objects):
    
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c: In function 'kobjsize':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: 'memory_end' undeclared (first use in this function)
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: (Each undeclared identifier is reported only once
    /home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: for each function it appears in.)
    
    The patch also removes now no longer required memory_{start,end}
    declarations inside access_ok().
    
    Reported-by: Adrian Bunk <adrian.bunk@movial.fi>
    Signed-off-by: Adrian Bunk <adrian.bunk@movial.fi>
    Cc: Hirokazu Takata <takata@linux-m32r.org>
    Cc: Michael Hennerich <Michael.Hennerich@analog.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9bb91784de6618c955994b2d5be332fb68c87ef1
Author: Josef Bacik <jbacik@redhat.com>
Date:   Thu Jun 5 22:46:47 2008 -0700

    ext3: fix online resize bug
    
    There is a bug when we are trying to verify that the reserve inode's
    double indirect blocks point back to the primary gdt blocks.  The fix is
    obvious, we need to mod the gdb count by the addr's per block.  You can
    verify this with the following test case
    
    dd if=/dev/zero of=disk1 seek=1024 count=1 bs=100M
    losetup /dev/loop1 disk1
    pvcreate /dev/loop1
    vgcreate loopvg1 /dev/loop1
    lvcreate -l 100%VG loopvg1 -n looplv1
    mkfs.ext3 -J size=64 -b 1024 /dev/loopvg1/looplv1
    mount /dev/loopvg1/looplv1 /mnt/loop
    dd if=/dev/zero of=disk2 seek=1024 count=1 bs=50M
    losetup /dev/loop2 disk2
    pvcreate /dev/loop2
    vgextend loopvg1 /dev/loop2
    lvextend -l 100%VG /dev/loopvg1/looplv1
    resize2fs /dev/loopvg1/looplv1
    
    without this patch the resize2fs fails, with it the resize2fs succeeds.
    
    Signed-off-by: Josef Bacik <jbacik@redhat.com>
    Acked-by: Andreas Dilger <adilger@sun.com>
    Cc: <linux-ext4@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d100d148aa48df3b6ad526a48624f906695efe60
Author: Pekka Enberg <penberg@cs.helsinki.fi>
Date:   Thu Jun 5 22:46:46 2008 -0700

    nommu: fix ksize() abuse
    
    The nommu binfmt code uses ksize() for pointers returned from do_mmap()
    which is wrong.  This converts the call-sites to use the nommu specific
    kobjsize() function which works as expected.
    
    Cc: Christoph Lameter <clameter@sgi.com>
    Cc: Matt Mackall <mpm@selenic.com>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Acked-by: Greg Ungerer <gerg@snapgear.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0842b245a8e6c14e3aa49f91018902591d1069b3
Author: Paul Jackson <pj@sgi.com>
Date:   Thu Jun 5 22:46:45 2008 -0700

    doc: document the kernel-doc conventions for kernel hackers
    
    Provide documentation of the kernel-doc documentation conventions oriented
    to kernel hackers.
    
    Since I figure that there will be more people reading this
    kernel-doc-nano-HOWTO.txt file who are kernel developers focused on the
    rest of the kernel, than there will be readers of this file who are
    documentation developers extracting that embedded kernel-doc
    documentation, I have taken the liberty of making the new section added
    here:
    
      How to format kernel-doc comments
    
    the first section of the kernel-doc-nano-HOWTO.txt file.
    
    This first section is intended to introduce, motivate and provide basic
    usage of the kernel-doc mechanism for kernel hackers developing other
    portions of the kernel.
    
    Signed-off-by: Paul Jackson <pj@sgi.com>
    Acked-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 659179b28f15ab1b1db5f8767090f5e728f115a1
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date:   Thu Jun 5 22:46:44 2008 -0700

    fbdev: export symbol fb_mode_option
    
    Frame buffer and mode setting drivers can be built as modules,
    so fb_mode_option needs to be exported to support these.
    
    Prevents this error:
    
      ERROR: "fb_mode_option" [drivers/ps3/ps3av_mod.ko] undefined!
    
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1502cb361666808acb1dfd92238fc2b7a7a48221
Author: Alan Cox <alan@redhat.com>
Date:   Thu Jun 5 22:46:42 2008 -0700

    MAINTAINERS: reiserfs entry is out of date
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Cc: Edward Shishkin <edward.shishkin@gmail.com>
    Cc: Jeff Mahoney <jeffm@suse.com>
    Cc: Chris Mason <chris.mason@oracle.com>
    Cc: Jan Kara <jack@ucw.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4fd5a433d4887f0a6c766c258ca335100ffe208a
Author: Vegard Nossum <vegard.nossum@gmail.com>
Date:   Thu Jun 5 22:46:42 2008 -0700

    v850: fix typo in header guard
    
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3b2d38b48b5abb6921ac6ad2d080ce82887cdbc7
Author: Vegard Nossum <vegard.nossum@gmail.com>
Date:   Thu Jun 5 22:46:41 2008 -0700

    h8300: fix typo in header guard
    
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9c81c5c95c00c35a328e1757ca45a66647105f6c
Author: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date:   Thu Jun 5 22:46:39 2008 -0700

    atmel_serial: filter out FP during baud rate detection
    
    I made a change to u-boot that used the FP (Fractional Part) field of BRGR
    to achieve more accurate baud rate generation.  Unfortunately, the
    atmel_serial driver looks at the whole BRGR register when trying to detect
    the baud rate that the port is currently running at, so setting FP to a
    nonzero value breaks the baud rate detection.
    
    I'll sit on the u-boot patch for a while longer, but this is clearly a
    bug in the atmel_serial driver which should be fixed.
    
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Acked-by: Andrew Victor <linux@maxim.org.za>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 81c6ce9bd3ed3a88caeb9ed97d874450d53339dc
Author: Nick Piggin <npiggin@suse.de>
Date:   Thu Jun 5 22:46:38 2008 -0700

    vt: fix vc_resize locking
    
    Lockdep says we can't take tasklist lock or sighand lock inside ctrl_lock.
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Acked-by: Alan Cox <alan@redhat.com>
    Cc: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: "Eric W. Biederman" <ebiederm@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit dfcceb26f89da86ec4ac9583c4515504af8c6c84
Author: Nadia Derbey <Nadia.Derbey@bull.net>
Date:   Thu Jun 5 22:46:38 2008 -0700

    ipc: only output msgmni value at boot time
    
    When posting:
    [PATCH 1/8] Scaling msgmni to the amount of lowmem
    (see http://lkml.org/lkml/2008/2/11/171), I have added a KERN_INFO message
    that is output each time msgmni is recomputed.
    
    In http://lkml.org/lkml/2008/4/29/575 Tony Luck complained that this
    message references an ipc namespace address that is useless.
    
    I first thought of using an audit_log instead of a printk, as suggested by
    Serge Hallyn.  But unfortunately, we do not have any other information
    than the namespace address to provide here too.  So I chose to move the
    message and output it only at boot time, removing the reference to the
    namespace.
    
    Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
    Cc: Pierre Peiffer <peifferp@gmail.com>
    Cc: Manfred Spraul <manfred@colorfullife.com>
    Acked-by: Tony Luck <tony.luck@intel.com>
    Cc: "Serge E. Hallyn" <serue@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 68aa0a206a7a2dd8655a50b36e8274eb87b84544
Author: Nadia Derbey <Nadia.Derbey@bull.net>
Date:   Thu Jun 5 22:46:36 2008 -0700

    ipc: restore MSGPOOL original value
    
    When posting:
    
    	[PATCH 1/8] Scaling msgmni to the amount of lowmem
    
    (see http://article.gmane.org/gmane.linux.kernel/637849/) I changed the
    MSGPOOL value to make it fit what is said in the man pages (i.e.  a size
    in bytes).
    
    But Michael Kerrisk rightly complained that this change could affect the
    ABI.  So I'm posting this patch to make MSGPOOL expressed back in Kbytes.
    Michael, on his side, has fixed the man page.
    
    Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
    Cc: Pierre Peiffer <peifferp@gmail.com>
    Cc: Manfred Spraul <manfred@colorfullife.com>
    Acked-by: Michael Kerrisk <mtk.manpages@googlemail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 774533b3e86fa52941c79aa80ab3f0cc511bba7f
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Thu Jun 5 22:46:34 2008 -0700

    vt: fix background color on line feed, DEC invert
    
    Original report: """I used to force my console to black-on-white by the
    command `setterm -inversescreen on`.  In 2.6.26-rc4, I get lots of black
    background characters."""
    
    Another addendum to commit c9e587ab.  This was previously missed out since
    I was not aware of what vc_decscnm was for.
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Reported-by: <thunder7@xs4all.nl>
    Tested-by: <thunder7@xs4all.nl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 879000f94442860e72c934f9e568989bc7fb8ec4
Author: CHIKAMA masaki <masaki.chikama@gmail.com>
Date:   Thu Jun 5 22:46:33 2008 -0700

    cpufreq: fix null object access on Transmeta CPU
    
    If cpu specific cpufreq driver(i.e.  longrun) has "setpolicy" function,
    governor object isn't set into cpufreq_policy object at "__cpufreq_set_policy"
    function in driver/cpufreq/cpufreq.c .
    
    This causes a null object access at "store_scaling_setspeed" and
    "show_scaling_setspeed" function in driver/cpufreq/cpufreq.c when reading or
    writing through /sys interface (ex.  cat
    /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed)
    
    Addresses:
    	http://bugzilla.kernel.org/show_bug.cgi?id=10654
    	https://bugzilla.redhat.com/show_bug.cgi?id=443354
    
    Signed-off-by: CHIKAMA Masaki <masaki.chikama@gmail.com>
    Cc: Dave Jones <davej@codemonkey.org.uk>
    Cc: Chuck Ebbert <cebbert@redhat.com>
    Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 10732c35dff6c2e15e413e7806a7114a2faa0ecf
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Thu Jun 5 22:46:33 2008 -0700

    fbcon: fix wrong vmode bits copied on console switch
    
    The interlaced and double line mode bits should not be copied to new
    console when the console is switched.  Otherwise, the new console may be
    set to incorrect refresh rate.
    
    Also, the x and y offsets does not need to be copied.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit dba6a4d32d8677c99e73798d3375417f8a6d46de
Author: Daniel Walker <dwalker@mvista.com>
Date:   Thu Jun 5 22:46:32 2008 -0700

    keys: remove unused key_alloc_sem
    
    This semaphore doesn't appear to be used, so remove it.
    
    Signed-off-by: Daniel Walker <dwalker@mvista.com>
    Cc: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 37340746a66e5e7feed5945f28cb75d90a8fd9f6
Author: Lai Jiangshan <laijs@cn.fujitsu.com>
Date:   Thu Jun 5 22:46:32 2008 -0700

    cpusets: fix bug when adding nonexistent cpu or mem
    
    Adding a nonexistent cpu to a cpuset will be omitted quietly.  It should
    return -EINVAL.
    
    Example: (real_nr_cpus <= 4 < NR_CPUS or cpu#4 was just offline)
    
    # cat cpus
    0-1
    # /bin/echo 4 > cpus
    # /bin/echo $?
    0
    # cat cpus
    
    #
    
    The same occurs when add a nonexistent mem.
    This patch will fix this bug.
    And when *buf == "", the check is unneeded.
    
    Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
    Acked-by: Paul Jackson <pj@sgi.com>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit aae8679b0ebcaa92f99c1c3cb0cd651594a43915
Author: Thomas Tuttle <ttuttle@google.com>
Date:   Thu Jun 5 22:46:31 2008 -0700

    pagemap: fix bug in add_to_pagemap, require aligned-length reads of /proc/pid/pagemap
    
    Fix a bug in add_to_pagemap.  Previously, since pm->out was a char *,
    put_user was only copying 1 byte of every PFN, resulting in the top 7
    bytes of each PFN not being copied.  By requiring that reads be a multiple
    of 8 bytes, I can make pm->out and pm->end u64*s instead of char*s, which
    makes put_user work properly, and also simplifies the logic in
    add_to_pagemap a bit.
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Thomas Tuttle <ttuttle@google.com>
    Cc: Matt Mackall <mpm@selenic.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d1ee2971f5bd8a16bc5ecfe1b00e14b4fe407c4f
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Thu Jun 5 22:46:28 2008 -0700

    devscgroup: make white list more compact in some cases
    
    Consider you added a 'c foo:bar r' permission to some cgroup and then (a
    bit later) 'c'foo:bar w' for it.  After this you'll see the
    
    c foo:bar r
    c foo:bar w
    
    lines in a devices.list file.
    
    Another example - consider you added 10 'c foo:bar r' permissions to some
    cgroup (e.g.  by mistake).  After this you'll see 10 c foo:bar r lines in
    a list file.
    
    This is weird.  This situation also has one more annoying consequence.
    Having many items in a white list makes permissions checking slower, sine
    it has to walk a longer list.
    
    The proposal is to merge permissions for items, that correspond to the
    same device.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7db9cfd380205f6b50afdc3bc3619f876a5eaf0d
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Thu Jun 5 22:46:27 2008 -0700

    devscgroup: check for device permissions at mount time
    
    Currently even if a task sits in an all-denied cgroup it can still mount
    any block device in any mode it wants.
    
    Put a proper check in do_open for block device to prevent this.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Tested-by: Serge Hallyn <serue@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cc9cb219aac24ffc711566c8f372c2b3a3bf840f
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Thu Jun 5 22:46:26 2008 -0700

    devscgroup: relax task to dev_cgroup conversion
    
    Two functions, that need to get a device_cgroup from a task (they are
    devcgroup_inode_permission and devcgroup_inode_mknod) make it in a strange
    way:
    
    They get a css_set from task, then a subsys_state from css_set, then a
    cgroup from the state and then a subsys_state again from the cgroup.
    Besides, the devices_subsys_id is read from memory, whilst there's a
    enum-ed constant for it.
    
    Optimize this part a bit:
    1. Get the subsys_stats form the task and be done - no 2 extra
       dereferences,
    2. Use the device_subsys_id constant, not the value from memory
       (i.e. one less dereference).
    
    Found while preparing 2.6.26 OpenVZ port.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Acked-by: Paul Menage <menage@google.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: Chris Wright <chrisw@sous-sol.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b66862f7663332aa1ecb3ebda4086360ddb8befc
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Thu Jun 5 22:46:24 2008 -0700

    devcgroup: make a helper to convert cgroup_subsys_state to devs_cgroup
    
    This is just picking the container_of out of cgroup_to_devcgroup into a
    separate function.
    
    This new css_to_devcgroup will be used in the 2nd patch.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Cc: Paul Menage <menage@google.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: Chris Wright <chrisw@sous-sol.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 93b071139a956e51c98cdefd50a47981a4eb852e
Author: Akinobu Mita <akinobu.mita@gmail.com>
Date:   Thu Jun 5 22:46:21 2008 -0700

    introduce memory_read_from_buffer()
    
    This patch introduces memory_read_from_buffer().
    
    The only difference between memory_read_from_buffer() and
    simple_read_from_buffer() is which address space the function copies to.
    
    simple_read_from_buffer copies to user space memory.
    memory_read_from_buffer copies to normal memory.
    
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Doug Warzecha <Douglas_Warzecha@dell.com>
    Cc: Zhang Rui <rui.zhang@intel.com>
    Cc: Matt Domsch <Matt_Domsch@dell.com>
    Cc: Abhay Salunke <Abhay_Salunke@dell.com>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Cc: Markus Rechberger <markus.rechberger@amd.com>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Bob Moore <robert.moore@intel.com>
    Cc: Thomas Renninger <trenn@suse.de>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: "Antonino A. Daplas" <adaplas@pol.net>
    Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
    Cc: Michael Holzheu <holzheu@de.ibm.com>
    Cc: Brian King <brking@us.ibm.com>
    Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: Andrew Vasquez <linux-driver@qlogic.com>
    Cc: Seokmann Ju <seokmann.ju@qlogic.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3527fb326f07bc8e85cf66d4f987ebeea24e8e4a
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu Jun 5 22:46:19 2008 -0700

    lib: export bitrev16
    
    Bluetooth will be able to use this.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Cc: Marcel Holtmann <marcel@holtmann.org>
    Cc: Dave Young <hidave.darkstar@gmail.com>
    Cc: Akinobu Mita <akinobu.mita@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f2eb432715a81a703e626df59347ba3557009557
Author: Jean Delvare <khali@linux-fr.org>
Date:   Thu Jun 5 22:46:18 2008 -0700

    rtc-ds1374: rename device to just "ds1374"
    
    Change the name of the device from "rtc-ds1374" to just "ds1374", to match
    what all other RTC drivers do.  I seem to remember that this name was
    chosen to avoid possible confusion with an older ds1374 driver, but that
    driver was removed 3 months ago.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Acked-by: Kumar Gala <galak@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 44d1b980c72db0faf35adb082fb2208351803028
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Thu Jun 5 22:46:18 2008 -0700

    Fix various old email addresses for dwmw2
    
    Although if people have questions about ARCnet, perhaps it's _better_
    for them to be mailing dwmw2@cam.ac.uk about it...
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b6d8adf477439e7086224bc9674c6b6638780783
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Jun 5 22:46:14 2008 -0700

    uml: PATH_MAX needs limits.h
    
    Include limits.h to get a definition of PATH_MAX.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3d5ede6f776bdb1483bcd086f79c3bf41fed3865
Author: Jeff Dike <jdike@addtoit.com>
Date:   Thu Jun 5 22:46:13 2008 -0700

    uml: stub needs to tolerate SIGWINCH
    
    We lost the marking of SIGWINCH as being OK to receive during stub
    execution, causing a panic should that happen.
    
    Cc: Benedict Verheyen <benedict.verheyen@gmail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8bfd04b974689f700bbd053ad6e66b0a95fb80c9
Author: Jeff Dike <jdike@addtoit.com>
Date:   Thu Jun 5 22:46:13 2008 -0700

    uml: memcpy export needs to follow host declaration
    
    x86_64 defines either memcpy or __memcpy depending on the gcc version, and
    it looks like UML needs to follow that in its exporting.
    
    Cc: Gabriel C <nix.or.die@googlemail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 40fb16a360d9c6459afee91dc793c1e3374feb94
Author: Tom Spink <tspink@gmail.com>
Date:   Thu Jun 5 22:46:12 2008 -0700

    uml: deal with inaccessible address space start
    
    This patch makes os_get_task_size locate the bottom of the address space,
    as well as the top.  This is for systems which put a lower limit on mmap
    addresses.  It works by manually scanning pages from zero onwards until a
    valid page is found.
    
    Because the bottom of the address space may not be zero, it's not
    sufficient to assume the top of the address space is the size of the
    address space.  The size is the difference between the top address and
    bottom address.
    
    [jdike@addtoit.com: changed the name to reflect that this function is
    supposed to return the top of the process address space, not its size and
    changed the return value to reflect that.  Also some minor formatting
    changes]
    Signed-off-by: Tom Spink <tspink@gmail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9f31287b443f30a591539e448fb628e3827a8f61
Author: Huang Weiyi <weiyi.huang@gmail.com>
Date:   Thu Jun 5 22:46:11 2008 -0700

    uml: remove a duplicate include
    
    Removed duplicated include file "kern_util.h" in
    arch/um/drivers/ubd_kern.c.
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 06e1e4ffbd1932e288839b3140cda6b8141eb684
Author: Jeff Dike <jdike@addtoit.com>
Date:   Thu Jun 5 22:46:10 2008 -0700

    uml: deal with host time going backwards
    
    Protection against the host's time going backwards (eg, ntp activity on
    the host) by keeping track of the time at the last tick and if it's
    greater than the current time, keep time stopped until the host catches
    up.
    
    Cc: Nix <nix@esperi.org.uk>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 34397892a3d677d857fdaf8dec66a66b07dde0b5
Author: Paul Jackson <pj@sgi.com>
Date:   Thu Jun 5 22:46:09 2008 -0700

    doc: update to URL and status of kernel-docs.txt entry
    
    Update status and URL for the "Gary's Encyclopedia" entry.
    
    Signed-off-by: Paul Jackson <pj@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a361a82c10c20eff402d72ce83b66913d04894ee
Author: Dan Williams <dcbw@redhat.com>
Date:   Thu Jun 5 22:46:08 2008 -0700

    fujitsu-laptop: autoload module on Lifebook P1510D
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Cc: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6cfd53fc03670c7a544a56d441eb1a6cc800d72b
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Thu Jun 5 22:46:08 2008 -0700

    nommu: fix kobjsize() for SLOB and SLUB
    
    kobjsize() has been abusing page->index as a method for sorting out
    compound order, which blows up both for page cache pages, and SLOB's
    reuse of the index in struct slob_page.
    
    Presently we are not able to accurately size arbitrary pointers that
    don't come from kmalloc(), so the best we can do is sort out the
    compound order from the head page if it's a compound page, or default
    to 0-order if it's impossible to ksize() the object.
    
    Obviously this leaves quite a bit to be desired in terms of object
    sizing accuracy, but the behaviour is unchanged over the existing
    implementation, while fixing the page->index oopses originally reported
    here:
    
    	http://marc.info/?l=linux-mm&m=121127773325245&w=2
    
    Accuracy could also be improved by having SLUB and SLOB both set PG_slab
    on ksizeable pages, rather than just handling the __GFP_COMP cases
    irregardless of the PG_slab setting, as made possibly with Pekka's
    patches:
    
    	http://marc.info/?l=linux-kernel&m=121139439900534&w=2
    	http://marc.info/?l=linux-kernel&m=121139440000537&w=2
    	http://marc.info/?l=linux-kernel&m=121139440000540&w=2
    
    This is primarily a bugfix for nommu systems for 2.6.26, with the aim
    being to gradually kill off kobjsize() and its particular brand of
    object abuse entirely.
    
    Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6f09bdfc717a0e1a89a029001484d5a195faab64
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Thu Jun 5 22:46:07 2008 -0700

    m68k: enable CONFIG_COMPAT_BRK by default
    
    As some m68k machines have plenty of libc5 binaries in active use, enable
    CONFIG_COMPAT_BRK by default.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a5b4592cf77b973c29e7c9695873a26052b58951
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Thu Jun 5 22:46:05 2008 -0700

    brk: make sys_brk() honor COMPAT_BRK when computing lower bound
    
    Fix a regression introduced by
    
    commit 4cc6028d4040f95cdb590a87db478b42b8be0508
    Author: Jiri Kosina <jkosina@suse.cz>
    Date:   Wed Feb 6 22:39:44 2008 +0100
    
        brk: check the lower bound properly
    
    The check in sys_brk() on minimum value the brk might have must take
    CONFIG_COMPAT_BRK setting into account.  When this option is turned on
    (i.e.  we support ancient legacy binaries, e.g.  libc5-linked stuff), the
    lower bound on brk value is mm->end_code, otherwise the brk start is
    allowed to be arbitrarily shifted.
    
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 33dda515a1995dfb3b6b57d7ace9b3ee9d449c11
Author: Roland.Kletzing <devzero@web.de>
Date:   Thu Jun 5 22:46:04 2008 -0700

    drivers/char/ip2: fix Kconfig after ip2/ip2main merge
    
    As commit 6089093e588ee3f6aed99d08b1cf5ea37c52cf97 ("ip2: fix crashes on
    load/unload") fixed the ip2 crashes on load/unload by making ip2/ip2main
    one module (ip2), Kconfig shouldn't mention a now non-existing module.
    
    Signed-off-by: Roland.Kletzing <devzero@web.de>
    Acked-by: Alan Cox <alan@redhat.com>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f6266e34713dc286b52623d8a4ff846973c0bcce
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Thu Jun 5 22:46:03 2008 -0700

    edd: fix incorrect return of 1 from module_init
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: Matt Domsch <Matt_Domsch@dell.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d3e49afbb66109613c3474f2273f5830ac2dcb09
Author: Michael Halcrow <mhalcrow@us.ibm.com>
Date:   Thu Jun 5 22:46:02 2008 -0700

    eCryptfs: remove unnecessary page decrypt call
    
    The page decrypt calls in ecryptfs_write() are both pointless and buggy.
    Pointless because ecryptfs_get_locked_page() has already brought the page
    up to date, and buggy because prior mmap writes will just be blown away by
    the decrypt call.
    
    This patch also removes the declaration of a now-nonexistent function
    ecryptfs_write_zeros().
    
    Thanks to Eric Sandeen and David Kleikamp for helping to track this
    down.
    
    Eric said:
    
       fsx w/ mmap dies quickly ( < 100 ops) without this, and survives
       nicely (to millions of ops+) with it in place.
    
    Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
    Cc: Eric Sandeen <sandeen@redhat.com>
    Cc: Dave Kleikamp <shaggy@austin.ibm.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c45dcabd2626c56f8c1235df9db065f584f3ac82
Author: Andy Whitcroft <apw@shadowen.org>
Date:   Thu Jun 5 22:46:01 2008 -0700

    update checkpatch.pl to version 0.19
    
    This version is a bit of a whopper.  This version brings a few new checks,
    improvements to a number of checks mostly through modifications to the
    way types are parsed, several fixes to quote/comment handling, as well as
    the usual slew of fixes for false positives.
    
    Of note:
     - return is not a function and is now reported,
     - preprocessor directive detection is loosened to match C99 standard,
     - we now intuit new type modifiers, and
     - comment handling is much improved
    
    Andy Whitcroft (18):
          Version: 0.19
          fix up a couple of missing newlines in reports
          colon to parenthesis spacing varies on asm
          values: #include is a preprocessor statement
          quotes: fix single character quotes at line end
          add typedef exception for the non-pointer "function types"
          kerneldoc parameters must be on one line, relax line length
          types: word boundary is not always required
          improved #define bracketing reports
          uninitialized_var is an annotation not a function name
          possible types: add possible modifier handling
          possible types: fastcall is a type modifier
          types: unsigned is not a modifier on all types
          static/external initialisation to zero should allow modifiers
          checkpatch: fix recognition of preprocessor directives -- part 2
          comments: fix inter-hunk comment tracking
          return is not a function
          do not report include/asm/foo.h use in include/linux/foo.h
          return is not a function -- tighten test
    
    [jengelh@computergmbh.de: fix recognition of preprocessor directives]
    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    Cc: Jan Engelhardt <jengelh@computergmbh.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4feead71fa68a41db1d4f065c0f91fd67288877d
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Jun 5 22:45:58 2008 -0700

    serial: fix driver_name conflicts
    
    Some drivers are using too generic "serial" name for driver_name, this
    might cause issues, like this:
    
    Freescale QUICC Engine UART device driver
    proc_dir_entry 'serial' already registered
    Call Trace:
    [cf82de50] [c0007f7c] show_stack+0x4c/0x1ac (unreliable)
    [cf82de90] [c00b03fc] proc_register+0xfc/0x1ac
    [cf82dec0] [c00b05c8] create_proc_entry+0x60/0xac
    [cf82dee0] [c00b23dc] proc_tty_register_driver+0x60/0x98
    [cf82def0] [c016dbd8] tty_register_driver+0x1b4/0x228
    [cf82df20] [c0184d70] uart_register_driver+0x144/0x194
    [cf82df40] [c030a378] ucc_uart_init+0x2c/0x94
    [cf82df50] [c02f21a0] kernel_init+0x98/0x27c
    [cf82dff0] [c000fa74] kernel_thread+0x44/0x60
    
    ^^ The board is using ucc_uart.c and 8250.c, both registered as
       "serial".
    
    This patch fixes two drivers that are using "serial" for driver_name and
    not "ttyS" for dev_name.  Drivers that are using "ttyS" for dev_name, will
    conflict anyway, so we don't bother with these.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: Alan Cox <alan@redhat.com>
    Acked-By: Timur Tabi <timur@freescale.com>
    Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4647875819aa210115d926242aa18e034517cece
Author: Nick Piggin <npiggin@suse.de>
Date:   Thu Jun 5 22:45:57 2008 -0700

    hugetlb: fix lockdep error
    
    =============================================
    [ INFO: possible recursive locking detected ]
    2.6.26-rc4 #30
    ---------------------------------------------
    heap-overflow/2250 is trying to acquire lock:
     (&mm->page_table_lock){--..}, at: [<c0000000000cf2e8>] .copy_hugetlb_page_range+0x108/0x280
    
    but task is already holding lock:
     (&mm->page_table_lock){--..}, at: [<c0000000000cf2dc>] .copy_hugetlb_page_range+0xfc/0x280
    
    other info that might help us debug this:
    3 locks held by heap-overflow/2250:
     #0:  (&mm->mmap_sem){----}, at: [<c000000000050e44>] .dup_mm+0x134/0x410
     #1:  (&mm->mmap_sem/1){--..}, at: [<c000000000050e54>] .dup_mm+0x144/0x410
     #2:  (&mm->page_table_lock){--..}, at: [<c0000000000cf2dc>] .copy_hugetlb_page_range+0xfc/0x280
    
    stack backtrace:
    Call Trace:
    [c00000003b2774e0] [c000000000010ce4] .show_stack+0x74/0x1f0 (unreliable)
    [c00000003b2775a0] [c0000000003f10e0] .dump_stack+0x20/0x34
    [c00000003b277620] [c0000000000889bc] .__lock_acquire+0xaac/0x1080
    [c00000003b277740] [c000000000089000] .lock_acquire+0x70/0xb0
    [c00000003b2777d0] [c0000000003ee15c] ._spin_lock+0x4c/0x80
    [c00000003b277870] [c0000000000cf2e8] .copy_hugetlb_page_range+0x108/0x280
    [c00000003b277950] [c0000000000bcaa8] .copy_page_range+0x558/0x790
    [c00000003b277ac0] [c000000000050fe0] .dup_mm+0x2d0/0x410
    [c00000003b277ba0] [c000000000051d24] .copy_process+0xb94/0x1020
    [c00000003b277ca0] [c000000000052244] .do_fork+0x94/0x310
    [c00000003b277db0] [c000000000011240] .sys_clone+0x60/0x80
    [c00000003b277e30] [c0000000000078c4] .ppc_clone+0x8/0xc
    
    Fix is the same way that mm/memory.c copy_page_range does the
    lockdep annotation.
    
    Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Adam Litke <agl@us.ibm.com>
    Acked-by: Nishanth Aravamudan <nacc@us.ibm.com>
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e2d4ecafd24d6eee4ae6bdbede0cfd0e78423a33
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Thu Jun 5 22:45:56 2008 -0700

    modedb: fix incorrect sync and vmode flags for CVT modes
    
    The temporary structure for calculated CVT mode is not initialized.  Few
    fields have only bits or-ed or and-ed so they may be left in incorrect
    (random) state.
    
    Testing of the tridentfb seems like a good exercise for the fbdev layer.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b8c141e8fd80fa64d80c6a74492053f25a28e0ea
Author: Adrian Bunk <bunk@kernel.org>
Date:   Thu Jun 5 22:45:55 2008 -0700

    frv: don't offer BINFMT_FLAT
    
    Fix the following compile error:
    
      CC      fs/binfmt_flat.o
    In file included from
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:36:
    /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/flat.h:14:22: error: asm/flat.h: No such file or directory
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c: In function 'create_flat_tables':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:124: error: implicit declaration of function 'flat_stack_align'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:125: error: implicit declaration of function 'flat_argvp_envp_on_stack'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c: In function 'calc_reloc':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:347: error: implicit declaration of function 'flat_reloc_valid'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c: In function 'load_flat_file':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:479: error: implicit declaration of function 'flat_old_ram_flag'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:755: error: implicit declaration of function 'flat_set_persistent'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:757: error: implicit declaration of function 'flat_get_relocate_addr'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:765: error: implicit declaration of function 'flat_get_addr_from_rp'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:781: error: implicit declaration of function 'flat_put_addr_at_rp'
    
    Reported-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Tested-by: David Howells <dhowells@redhat.com>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6a7d68e899b7f609708e7590784344f03640f774
Author: Miao Xie <miaox@cn.fujitsu.com>
Date:   Thu Jun 5 22:45:54 2008 -0700

    cpusets: fix and update Documentation
    
    Make the doc consistent with current cpusets implementation.
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Acked-by: Paul Jackson <pj@sgi.com>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c337869d95011495fa181536786e74aa2d7ff031
Author: Dan Williams <dan.j.williams@intel.com>
Date:   Thu Jun 5 22:45:54 2008 -0700

    md: do not compute parity unless it is on a failed drive
    
    If a block is computed (rather than read) then a check/repair operation
    may be lead to believe that the data on disk is correct, when infact it
    isn't.  So only compute blocks for failed devices.
    
    This issue has been around since at least 2.6.12, but has become harder to
    hit in recent kernels since most reads bypass the cache.
    
    echo repair > /sys/block/mdN/md/sync_action will set the parity blocks to the
    correct state.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Neil Brown <neilb@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a6d8113a986c66aeb379a26b6e0062488b3e59e1
Author: Dan Williams <dan.j.williams@intel.com>
Date:   Thu Jun 5 22:45:53 2008 -0700

    md: fix uninitialized use of mddev->recovery_wait
    
    If an array was created with --assume-clean we will oops when trying to
    set ->resync_max.
    
    Fix this by initializing ->recovery_wait in mddev_find.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Neil Brown <neilb@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e0a115e5aa554b93150a8dc1c3fe15467708abb2
Author: Dan Williams <dan.j.williams@intel.com>
Date:   Thu Jun 5 22:45:52 2008 -0700

    md: fix prexor vs sync_request race
    
    During the initial array synchronization process there is a window between
    when a prexor operation is scheduled to a specific stripe and when it
    completes for a sync_request to be scheduled to the same stripe.  When
    this happens the prexor completes and the stripe is unconditionally marked
    "insync", effectively canceling the sync_request for the stripe.  Prior to
    2.6.23 this was not a problem because the prexor operation was done under
    sh->lock.  The effect in older kernels being that the prexor would still
    erroneously mark the stripe "insync", but sync_request would be held off
    and re-mark the stripe as "!in_sync".
    
    Change the write completion logic to not mark the stripe "in_sync" if a
    prexor was performed.  The effect of the change is to sometimes not set
    STRIPE_INSYNC.  The worst this can do is cause the resync to stall waiting
    for STRIPE_INSYNC to be set.  If this were happening, then STRIPE_SYNCING
    would be set and handle_issuing_new_read_requests would cause all
    available blocks to eventually be read, at which point prexor would never
    be used on that stripe any more and STRIPE_INSYNC would eventually be set.
    
    echo repair > /sys/block/mdN/md/sync_action will correct arrays that may
    have lost this race.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Neil Brown <neilb@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b2c8daddcbe03a22402ecf943bb88302601c6835
Author: David Brownell <dbrownell@users.sourceforge.net>
Date:   Thu Jun 5 22:45:50 2008 -0700

    spi: fix refcount-related spidev oops-on-rmmod
    
    This addresses other oopsing paths in "spidev" by changing how it manages
    refcounting.  It decouples the lifecycle of the per-device data from the
    class device (not just the spi device):
    
      - Use class_{create,destroy} not class_{register,unregister}.
      - Use device_{create,destroy} not device_{register,unregister}.
      - Free the per-device data only when TWO conditions are true:
          * Driver is unbound from underlying SPI device, and
          * Device is no longer open (new)
    
    Also, spi_{get,set}_drvdata not dev_{get,set}_drvdata for simpler code.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Sebastian Siewior <bigeasy@tglx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 27676a3e166b352928a8ef7b1c0e322f3c471a3e
Author: Ralph Campbell <ralph.campbell@qlogic.com>
Date:   Fri Jun 6 11:23:29 2008 -0700

    IB/ipath: Fix SM trap forwarding
    
    SM/SMA traps received by the ipath driver should be forwarded to the
    SM if it is running on the host.  The ib_ipath driver was incorrectly
    replying with "bad method."
    
    Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 088af1543c611f4200658250b6a4467b7eb496a6
Author: Joachim Fenkes <fenkes@de.ibm.com>
Date:   Fri Jun 6 11:21:33 2008 -0700

    IB/ehca: Reject send WRs only for RESET, INIT and RTR state
    
    Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit bc01886352c277e310c07befadbb617c8f561b89
Author: Chen Gong <g.chen@freescale.com>
Date:   Thu Jun 5 21:50:04 2008 +0800

    [MTD] m25p80.c mutex unlock fix
    
    fix a mutex release bug in function m25p80_write.
    
    Signed-off-by: Chen Gong <g.chen@freescale.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

commit 868e15dbd2940f9453b4399117686f408dc77299
Author: Jaroslav Franek <jarin.franek@post.cz>
Date:   Fri Jun 6 11:04:19 2008 +0200

    sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card
    
    When the Linux kernel is compiled with CONFIG_DEBUG_SHIRQ=y,
    the Soundblaster Audigy2 ZS Notebook PCMCIA card causes the
    system hang during boot (udev stage) or when the card is hot-plug.
    The CONFIG_DEBUG_SHIRQ flag is by default 'y' with all Fedora
    kernels since 2.6.23. The problem was reported as
    https://bugzilla.redhat.com/show_bug.cgi?id=326411
    
    The issue was hunted down to the snd_emu10k1_create() routine:
    
    /* pseudo-code */
    snd_emu10k1_create(...) {
    	...
    	request_irq(... IRQF_SHARED ...) {
    		register the irq handler
    		#ifdef CONFIG_DEBUG_SHIRQ
    		call the irq handler: snd_emu10k1_interrupt() {
    			poll I/O port   // <---- !! system hangs
    			...
    		}
    		#endif
    	}
    	...
    	snd_emu10k1_cardbus_init(...) {
    		initialize I/O ports
    	}
    	...
    }
    
    The early access to I/O port in the interrupt handler causes
    the freeze. Obviously it is necessary to init the I/O ports
    before accessing them. This patch moves the registration of
    the irq handler after the initialization of the I/O ports.
    
    Signed-off-by: Jaroslav Franek <jarin.franek@post.cz>
    Acked-by: James Courtier-Dutton <James@superbug.co.uk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 39b945a37bac2b692773a470890c8ba301485b15
Merge: 203c801... 0ef2cfc...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 5 16:15:00 2008 -0700

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] pxa: fix tosa.c build error
      [ARM] 5067/1: _raw_write_can_lock macro bugfix
      [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
      [ARM] 5068/1: PXA2xx Additional gpio definitions
      [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
      [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
      [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
      [ARM] 5060/1: remove unnecessary include of asm/io.h
      [ARM] fix AT91 include loops

commit 203c80187eba037f2d6562e0d5847014746726dd
Author: Ben Collins <ben.collins@canonical.com>
Date:   Thu Jun 5 19:10:21 2008 -0400

    mmc: Fix crash in mmc_block on 64-bit
    
    Fairly simple. "dev_use" was being allocated as a zero length array
    because of bad math on 64-bit systems, causing a crash in
    find_first_zero_bit(). One-liner follows:
    
    Signed-off-by: Ben Collins <ben.collins@canonical.com>
    Acked-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9f67fd5db50566728996b0115a08c83d4f902cb3
Author: Bertram Felgenhauer <int-e@gmx.de>
Date:   Thu Jun 5 15:31:22 2008 -0700

    x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
    
    This BIOS claims the VIA 8237 south bridge to be compatible with VIA 586,
    which it is not.
    
    Without this patch, I get the following warning while booting,
    among others,
    
    | PCI: Using IRQ router VIA [1106/3227] at 0000:00:11.0
    | ------------[ cut here ]------------
    | WARNING: at arch/x86/pci/irq.c:265 pirq_via586_get+0x4a/0x60()
    | Modules linked in:
    | Pid: 1, comm: swapper Not tainted 2.6.26-rc4-00015-g1ec7d99 #1
    |  [<c0119fd4>] warn_on_slowpath+0x54/0x70
    |  [<c02246e0>] ? vt_console_print+0x210/0x2b0
    |  [<c02244d0>] ? vt_console_print+0x0/0x2b0
    |  [<c011a413>] ? __call_console_drivers+0x43/0x60
    |  [<c011a482>] ? _call_console_drivers+0x52/0x80
    |  [<c011aa89>] ? release_console_sem+0x1c9/0x200
    |  [<c0291d21>] ? raw_pci_read+0x41/0x70
    |  [<c0291e8f>] ? pci_read+0x2f/0x40
    |  [<c029151a>] pirq_via586_get+0x4a/0x60
    |  [<c02914d0>] ? pirq_via586_get+0x0/0x60
    |  [<c029178d>] pcibios_lookup_irq+0x15d/0x430
    |  [<c03b895a>] pcibios_irq_init+0x17a/0x3e0
    |  [<c03a66f0>] ? kernel_init+0x0/0x250
    |  [<c03a6763>] kernel_init+0x73/0x250
    |  [<c03b87e0>] ? pcibios_irq_init+0x0/0x3e0
    |  [<c0114d00>] ? schedule_tail+0x10/0x40
    |  [<c0102dee>] ? ret_from_fork+0x6/0x1c
    |  [<c03a66f0>] ? kernel_init+0x0/0x250
    |  [<c03a66f0>] ? kernel_init+0x0/0x250
    |  [<c010324b>] kernel_thread_helper+0x7/0x1c
    |  =======================
    | ---[ end trace 4eaa2a86a8e2da22 ]---
    
    and IRQ trouble later,
    
    | irq 10: nobody cared (try booting with the "irqpoll" option)
    
    Now that's an VIA 8237 chip, so pirq_via586_get shouldn't be called
    at all; adding this workaround to via_router_probe() fixes the
    problem for me.
    
    Amazingly I have a 2.6.23.8 kernel that somehow works fine ... I'll
    never understand why.
    
    Signed-off-by: Bertram Felgenhauer <int-e@gmx.de>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Acked-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit b2ab26ab28cfed076ee8a83627d008472f6ac54f
Merge: 5965087... be573e7...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 5 14:30:47 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (48 commits)
      V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070
      V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain
      V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7
      V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map
      V4L/DVB (7978): cx18: explicitly test for XC2028 tuner
      V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.
      V4L/DVB (7975): saa7134_empress
      V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error
      V4L/DVB (7972): or51132.c: unaligned
      V4L/DVB (7971): usb: unaligned
      V4L/DVB (7970): mix trivial endianness annotations
      V4L/DVB (7969): m920x: unaligned access
      V4L/DVB (7968): zoran: endianness annotations
      V4L/DVB (7967): bt8xx: unaligned access
      V4L/DVB (7966): cx18: direct dereferencing of iomem
      V4L/DVB (7965): annotate bcx_riscmem
      V4L/DVB (7964): cx18 iomem annotations
      V4L/DVB (7963): ivtv: trivial annotations
      V4L/DVB (7962): ttusb endianness annotations and fixes
      V4L/DVB (7961): fix endianness bug in dib0700_devices.c
      ...

commit 5965087dc96167298ab83598f681d4d6f9d324fa
Merge: 698f7a4... cd9da13...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 5 14:29:53 2008 -0700

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      Fix divide by zero error in build_clear_page() and build_copy_page()
      [MIPS] Fix typo in header guard
      [MIPS] Fix build error - Delete debugging crap that crept in with CMP
      [MIPS] Add accessors for random register.
      [MIPS] IP27: misc fixes
      [MIPS] IP27: Fix clockevent setup
      [MIPS] IP27: Fix bootmem memory setup
      [MIPS] remove CONFIG_CPU_R4000 line from Makefile
      [MIPS] Fix check for valid stack pointer during backtrace
      [MIPS] Add missing braces to pte_mkyoung
      [MIPS] R4700: Fix build_tlb_probe_entry
      [MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids.
      [MIPS] Alchemy: export get_au1x00_speed for modules

commit 2bdd1b031b200d55c2512c8d7e0e9bdcf85d011f
Author: Andres Salomon <dilinger@queued.net>
Date:   Thu Jun 5 14:14:41 2008 -0700

    PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
    
    Previously, one would have to specifically choose CONFIG_OLPC and
    CONFIG_PCI_GOOLPC in order to enable PCI_OLPC.  That doesn't really work
    for distro kernels, so this patch allows one to choose CONFIG_OLPC and
    CONFIG_PCI_GOANY in order to build in OLPC support in a generic kernel (as
    requested by Robert Millan).
    
    This also moves GOOLPC before GOANY in the menuconfig list.
    
    Finally, make pci_access_init return early if we detect OLPC hardware.
    There's no need to continue probing stuff, and pci_pcbios_init
    specifically trashes our settings (we didn't run into that before because
    PCI_GOANY wasn't supported).
    
    Signed-off-by: Andres Salomon <dilinger@debian.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 698f7a4a12c15fef354b2a1ac14f90a0e71008d9
Merge: adbd588... ba75321...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jun 5 14:25:48 2008 -0700

    Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
    
    * git://git.infradead.org/~dwmw2/mtd-2.6.26:
      [MTD] [MAPS] Fix cmdlineparse handling in mapping files
      [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path

commit adbd5886da5f467148b26cca3728ab0e672b3fcc
Author: Willy Tarreau <w@1wt.eu>
Date:   Tue Jun 3 00:20:28 2008 +0200

    doc: add suggestions about good practises for maintainers
    
    Suggest how to deal with patch modifications caused by
    merging or back-porting when you're a maintainer.
    
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ddb2c43594f22843e9f3153da151deaba1a834c5
Author: Chris Wright <chrisw@sous-sol.org>
Date:   Wed Jun 4 09:16:33 2008 -0700

    asn1: additional sanity checking during BER decoding
    
    - Don't trust a length which is greater than the working buffer.
      An invalid length could cause overflow when calculating buffer size
      for decoding oid.
    
    - An oid length of zero is invalid and allows for an off-by-one error when
      decoding oid because the first subid actually encodes first 2 subids.
    
    - A primitive encoding may not have an indefinite length.
    
    Thanks to Wei Wang from McAfee for report.
    
    Cc: Steven French <sfrench@us.ibm.com>
    Cc: stable@kernel.org
    Acked-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit efedf51c866130945b5db755cb58670e60205d83
Author: Nick Piggin <npiggin@suse.de>
Date:   Wed Jun 4 17:18:42 2008 +0200

    Add 'rd' alias to new brd ramdisk driver
    
    Alias brd to rd in the hope of helping legacy users. Suggested by Jan.
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 16104b5504fa8be130f7f127a5a1c7dd774efc44
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Thu Jun 5 22:47:13 2008 +0200

    x86: fix CONFIG_NONPROMISC_DEVMEM prompt and help text
    
    Here is an attempt to translate the prompt and help text into something
    which is legible and, as a bonus, correct.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 609a70ac927b72da647ccee7873d928d45055eae
Author: David Howells <dhowells@redhat.com>
Date:   Thu Jun 5 17:07:35 2008 +0100

    FRV: ip_fast_csum() requires a memory clobber on its inline asm
    
    ip_fast_csum() requires a memory clobber on its inline asm as it accesses
    memory in a fashion that gcc can't predict.
    
    The GCC manual says:
    
     If your assembler instructions access memory in an unpredictable
     fashion, add `memory' to the list of clobbered registers.  This will
     cause GCC to not keep memory values cached in registers across the
     assembler instruction and not optimize stores or loads to that memory.
    
    The bug hasn't been noticed in FRV, but it has been seen in PA-RISC.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5a515bcbea580a65ced92405b083299df9003748
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date:   Thu Jun 5 10:32:23 2008 -0600

    PNP: skip UNSET MEM resources as well as DISABLED ones
    
    We don't need to reserve "unset" resources.  Trying to reserve
    them results in messages like this, which are ugly but harmless:
    
        system 00:08: iomem range 0x0-0x0 could not be reserved
    
    Future PNP patches will remove use of IORESOURCE_UNSET, but
    we still need it for now.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cd9da13d6ef4f4b652a9a885d4a7c80e40fed229
Author: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date:   Wed May 7 23:38:15 2008 +0900

    Fix divide by zero error in build_clear_page() and build_copy_page()
    
    Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 2cc3c0b67bdde7263f6eb16c16709e0b84047646
Author: Vegard Nossum <vegard.nossum@gmail.com>
Date:   Tue May 27 17:27:28 2008 +0200

    [MIPS] Fix typo in header guard
    
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 482845a348f76fbf9cec6dda0f1eb113d4fafd9d
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Mon May 26 09:47:55 2008 +0100

    [MIPS] Fix build error - Delete debugging crap that crept in with CMP
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 272bace7f3753ea8bf6ee80e3a6b32fa64190744
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Mon May 26 09:35:47 2008 +0100

    [MIPS] Add accessors for random register.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 96173a6c4ebca4c146bb87026cce78bbe392cb61
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Thu Apr 17 22:07:42 2008 +0200

    [MIPS] IP27: misc fixes
    
    - fix PCI interrupt assignment by emulating ioc3 interrupt pin register
    - use pci_probe_only mode
    - select correct page size in bridge
    - remove no longer needed ioc3_sio_init() code
    
    [Ralf: Fix for 64kB or larger pagesizes]
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b32bb803fb52cc669762780d44b4c3d9e3d799f6
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Tue Apr 8 23:43:57 2008 +0200

    [MIPS] IP27: Fix clockevent setup
    
    Fix breakage introduced by converting hub_rt to clockevent.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 2bf8ec2d8137e66998435ddf6d4060a558e2f727
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Tue Apr 8 23:43:46 2008 +0200

    [MIPS] IP27: Fix bootmem memory setup
    
    Changes in the generic bootmem code broke memory setup for IP27. This
    patch fixes this by replacing lots of special IP27 code with generic
    bootmon code. This has been tested only on a single node.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c2719d93836b0b0cdf1725449d87705da6ede9a5
Author: Adrian Bunk <bunk@kernel.org>
Date:   Wed May 21 01:55:02 2008 +0300

    [MIPS] remove CONFIG_CPU_R4000 line from Makefile
    
    The existing options are named CONFIG_CPU_R4300 and CONFIG_CPU_R4X00,
    and they are directly below.
    
    Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 10220c884444a1866bb070e207d84fc18188e2a7
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Mon May 12 17:58:48 2008 +0200

    [MIPS] Fix check for valid stack pointer during backtrace
    
    The newly added check for valid stack pointer address breaks at least for
    64bit kernels.  Use __get_user() for accessing stack content to avoid crashes,
    when doing the backtrace.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 057229f9efc7ebebd3ce0496195ed46df631f383
Author: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date:   Fri May 2 14:08:20 2008 +0300

    [MIPS] Add missing braces to pte_mkyoung
    
    Only the version pte_mkyoung for 36-bit pagetables on 32-bit hw was
    affected and with this bug being around since November 29, 2004 there
    is evidence to suport the assumption it was benign ;-)
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 326e2e1a59decc81bea052e8a8c6d75c63daa2db
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Mon May 12 13:55:42 2008 +0200

    [MIPS] R4700: Fix build_tlb_probe_entry
    
    Treat R4700 like R4600 in build_tlb_probe_entry. Without this fix kernel
    will lock up.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ccdb0034f8d5321be42c479dd7fc872ba2a46adb
Author: Manuel Lauss <mlau@msc-ge.com>
Date:   Wed May 7 13:45:23 2008 +0200

    [MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids.
    
    Add API to delete custom DDMA device ids create with
    au1xxx_ddma_device_add().
    
    Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b1fb05cdb9096e3fe1af4474e108dedce2515801
Author: Manuel Lauss <mlau@msc-ge.com>
Date:   Wed May 7 13:42:55 2008 +0200

    [MIPS] Alchemy: export get_au1x00_speed for modules
    
    au1xmmc.c driver depends on it, so export it for modules.
    
    Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 6311c90a9ea16b4ab93ed48f1a9022647f6b3c43
Author: Hugh Dickins <hugh@veritas.com>
Date:   Thu Jun 5 14:44:39 2008 +0100

    libata: fix G5 SATA broken on -rc5
    
    Fix G5 SATA irq 18: nobody cared, reported on -rc5 by Olaf Hering:
    fixlet to a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2 libata-sff:
    Fix oops reported in kerneloops.org for pnp devices with no ctl
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Tested-by: Olaf Hering <olaf@aepfle.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit be573e7872432918e1017cf1e917e73817dcdad6
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Thu Jun 5 13:08:29 2008 -0300

    V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 67642a0a58143761d7415f0587e0ac6dd6371251
Author: Sigmund Augdal <sigmund@snap.tv>
Date:   Thu Jun 5 12:53:08 2008 -0300

    V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain
    
    Check that tda827x_config is defined before attempting to use it.
    
    Signed-off-by: Sigmund Augdal <sigmund@snap.tv>
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit a9606ce697ed719071fcccee8591ff033fa5e16d
Author: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Date:   Tue Jun 3 21:29:45 2008 -0300

    V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7
    
    
    Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit fc60d6e2727157b53d49c8d55888d0a78dafbc9f
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sat May 31 18:18:55 2008 -0300

    V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map
    
    On the TDA18271HD/C1, we perform RF tracking filter correction for VHF low
    band, only. If supplied a frequency out of range, the error must be returned
    to the caller (tda18271c1_rf_tracking_filter_calibration) so that it can
    decide whether or not to write to register EB14, RFC_CPROG[7:0]
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 4ecc24737700f07d6c2a8fdf8c1737e399f1830f
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Fri May 30 11:03:12 2008 -0300

    V4L/DVB (7978): cx18: explicitly test for XC2028 tuner
    
    Testing whether xceive_pin is non-zero is not good enough as 0 is a valid
    value. Instead explicitly test whether the Xceive tuner is used.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 5e7fdc5ed820516f8253cc7daad27cf3ee6bd784
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Fri May 30 10:51:53 2008 -0300

    V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 388748e61cc59487c34e1dfa890ffc44e4d16b1f
Author: Dmitri Belimov <d.belimov@gmail.com>
Date:   Wed May 21 01:20:34 2008 -0300

    V4L/DVB (7975): saa7134_empress
    
    This is patch for fix data structure in querycap syscall.
    
    Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 6637dea60ec93916ea0623a0e9bcc2b1769cbc11
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue May 20 19:34:09 2008 -0300

    V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error
    
    -tip testing found the following build failure:
    
      LD      .tmp_vmlinux1
      drivers/built-in.o: In function `generic_set_freq':
      tuner-xc2028.c:(.text+0xbd896): undefined reference to `request_firmware'
      tuner-xc2028.c:(.text+0xbdd7a): undefined reference to `release_firmware'
      drivers/built-in.o: In function `xc_load_fw_and_init_tuner':
      xc5000.c:(.text+0xc68e6): undefined reference to `request_firmware'
      xc5000.c:(.text+0xc6abe): undefined reference to `release_firmware'
    
    with this config:
    
      http://redhat.com/~mingo/misc/config-Tue_May_20_18_11_34_CEST_2008.bad
    
    the reason is another kconfig tool bug that has to be worked around in
    the driver's Kconfig file: if FW_LOADER is selected in a second
    dependency, that is not properly propagated up the dependencies.
    
    in this case, FW_LOADER is selected from MEDIA_TUNER_XC2028:
    
      config MEDIA_TUNER_XC2028
            tristate "XCeive xc2028/xc3028 tuners"
            depends on VIDEO_MEDIA && I2C
            depends on HOTPLUG
            select FW_LOADER
    
    which got selected by MEDIA_TUNER:
    
      config MEDIA_TUNER
            tristate
            default VIDEO_MEDIA && I2C
            depends on VIDEO_MEDIA && I2C
            select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
    
    but the kconfig tool did not pick up this second-order dependency and
    allowed CONFIG_FW_LOADER=m to be selected - in which case the build
    fails.
    
    the workaround i found was to move the select of FW_LOADER one level up,
    so that the buggy kconfig tool can notice it and can act appropriately.
    This problem can probably be worked around in other ways as well, i went
    for the minimal fix.
    
    Obviously, the kconfig tool should be fixed, it is not reasonable to
    expect driver authors to do manual dependency resolution (that kconfig
    itself already does) and uglify the Kconfig files. The kconfig tool did
    nothing to warn about this situation and did not prevent this faulty
    .config from being constructed.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 18dcd55a8bf8aa7009c647725b5234c9589c6985
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:33:11 2008 -0300

    V4L/DVB (7972): or51132.c: unaligned
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 637007fe5cfc790c46e3d7af8ba069ddd73f389c
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:33:01 2008 -0300

    V4L/DVB (7971): usb: unaligned
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit a954b6681dd389e6bb63d9b5f3254d675f6984c9
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:32:51 2008 -0300

    V4L/DVB (7970): mix trivial endianness annotations
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit fa9c13a383ea60b5e0a89e9e180683411bc5552c
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:32:41 2008 -0300

    V4L/DVB (7969): m920x: unaligned access
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 581a7f1a2ddedbc27ad76f518b861ce1e60ff5ab
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:32:31 2008 -0300

    V4L/DVB (7968): zoran: endianness annotations
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit c1c36f3128c89aa96f01cbf6d40b0cd77a8bc45e
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:32:21 2008 -0300

    V4L/DVB (7967): bt8xx: unaligned access
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 576904bb8941d2ae958a097888cee418d5192144
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:32:11 2008 -0300

    V4L/DVB (7966): cx18: direct dereferencing of iomem
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit d8eaa58b06e8779453410d88d2d86e700a0432c6
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:31:51 2008 -0300

    V4L/DVB (7965): annotate bcx_riscmem
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 990c81c8afcd71eced2482ad59950ea755eddc7f
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:32:01 2008 -0300

    V4L/DVB (7964): cx18 iomem annotations
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit b0510f8dc73dce56f35337487c6374ae84b15446
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:31:41 2008 -0300

    V4L/DVB (7963): ivtv: trivial annotations
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit d4f979a9e1c5c8ed291e89ec38248823c9a182ba
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:31:31 2008 -0300

    V4L/DVB (7962): ttusb endianness annotations and fixes
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit da5ee48677b96dbf44c2ae46857dea060af34164
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:31:21 2008 -0300

    V4L/DVB (7961): fix endianness bug in dib0700_devices.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 12fbcef1055ee7dd522d578c4c6c0e80acaa3d4c
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:31:11 2008 -0300

    V4L/DVB (7960): net: endianness annotations
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit b05ce2e79ebaf205b2d66ac32f10e2bd231d80a4
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:31:01 2008 -0300

    V4L/DVB (7959): endianness fix in flexcop-usb.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 3e085629bc921c37c1bb2e2fb6227fa14de14682
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:30:51 2008 -0300

    V4L/DVB (7958): fix unaligned access in av7110.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit a230e55d92347e09d9ba2e97096df114b2dfaf2d
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:30:41 2008 -0300

    V4L/DVB (7957): fix the roothole in av7110_av.c
    
    direct dereferencing from user-supplied address
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Reviewed-by: Oliver Endriss <o.endriss@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit f34ec12a17984d7df784bf49caf64f5f743e5e10
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 00:30:31 2008 -0300

    V4L/DVB (7956): cinergyT2: endianness annotations, endianness and race fixes
    
    Endianness annotations and fixes + fixing the handling of
    ->uncorrected_block_count
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 39028ec69b13712ec1dcd9aa14844bf60f19cb20
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Mon Jun 2 15:46:51 2008 -0300

    V4L/DVB (7166): [v4l] Add new user class controls and deprecate others
    
    These were removed in commit 26d507fcfef7f7d0cd2eec874a87169cc121c835:
    
    > -#define V4L2_CID_HCENTER               (V4L2_CID_BASE+22)
    > -#define V4L2_CID_VCENTER               (V4L2_CID_BASE+23)
    > -#define V4L2_CID_LASTP1                        (V4L2_CID_BASE+24) /*
    > last CID + 1 */
    > +
    > +/* Deprecated, use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
    > +#define V4L2_CID_HCENTER_DEPRECATED    (V4L2_CID_BASE+22)
    > +#define V4L2_CID_VCENTER_DEPRECATED    (V4L2_CID_BASE+23)
    
    But there was no warning in Documentation/feature-removal-schedule.txt
    and I'm receiving reports that it's breaking userspace apps (the
    gstreamer-v4l2 plugin breaks in Fedora rawhide). You can't just pull
    things from the published userspace API like that.
    
    Please can we revert the addition of _DEPRECATED to these ioctl
    definitions. Perhaps we can add a runtime warning if they actually get
    used? Or a compile-time warning if we can manage that?
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit c663d03590a882f4834197bff278ca0aa2a95e2e
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Fri Apr 18 21:22:50 2008 -0300

    V4L/DVB (7944): tuner-xc2028: use hybrid_tuner_request_state
    
    Use a standard method to manage multiple instances of a hybrid tuner.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 9adea1c00df74823e1719ebbcb86c972c4c2aba1
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Fri Apr 18 20:26:04 2008 -0300

    V4L/DVB (7943): tuner: add macro, hybrid_tuner_report_instance_count
    
    Create a macro to report the number of instances of the tuner driver
    currently in use.  This will allow drivers to perform specific cleanups
    before destroying the last instance of a tuner.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit ba60bc673ce7d019ae6684cebbb33e5239346664
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Sun May 25 14:34:36 2008 -0300

    V4L/DVB (7934): cx18: move gpio_dir/val statics to the cx18 struct.
    
    The gpio_dir/val statics cannot be global, they are card-specific.
    
    Thanks to Andy Walls for pointing this out.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 8f9935732930e705cab1936a03418ce01aee979a
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Sun May 25 11:45:53 2008 -0300

    V4L/DVB (7932): cx18: mark Compro H900 as fully supported.
    
    I always assumed that the Compro H900 could do digital as well,
    but it turned out that it is an analog-only card.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 31554ae599a8ff6854bf8ecbedc1946c64854388
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Sun May 25 11:21:27 2008 -0300

    V4L/DVB (7931): cx18: allow for simultaneous digital and analog capture
    
    The HVR-1600 can do both analog and digital capture at the same time.
    Due to a driver bug -EBUSY would be returned when attempting to setup an
    analog capture while a digital capture was already in progress.
    
    Separate the two internally.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit be303e16dbd210077c697aaf2f0960413166b53d
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Sat May 24 12:43:43 2008 -0300

    V4L/DVB (7930): ivtv: bump version to 1.3.0.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 63b8c709895febf62766dc8e818a1457a520fb15
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Wed May 21 17:40:19 2008 -0300

    V4L/DVB (7928): cx18: fix audio registers 808 and 80c
    
    The handling of the audio registers 808 and 80c were based on old datasheets.
    Updated to the latest information.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 7f3917f6484938d56cb5ab660f476c1dfa445a81
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon May 19 22:13:02 2008 -0300

    V4L/DVB (7925): cx18: ensure that the xceive pin is always asserted on init.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 3b4a9714f43a1d675a4352260a12daae197f37c3
Author: Andy Walls <awalls@radix.net>
Date:   Mon May 26 01:31:17 2008 -0300

    V4L/DVB (7922): tuner-simple: fix tuner_warn() induced kernel oops in simple_tuner_attach()
    
    The tuner_warn() macro relies on the local variable "priv" to be a valid
    pointer.  There was a case in simple_tuner_attach() where this cannot be the
    case yet, so tuner_warn() would dereference a NULL "priv" pointer.  Changed
    the tuner_warn() to a printk() with the originally intended output format.
    
    Signed-off-by: Andy Walls <awalls@radix.net>
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 5cf3f5cd1f6ee0d81b75c659c732dd8dd245a350
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sat May 24 23:49:03 2008 -0300

    V4L/DVB (7919): VIDEO_AU0828 does not depend on VIDEO_DEV
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 383a211699026ee41d9726e3f5edcfa1b0071b8f
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sat May 24 23:48:16 2008 -0300

    V4L/DVB (7918): au0828: remove irrelevent analog tuner standby code
    
    This code is irrelevant to this driver and should be removed.  This was
    copied from a hack in cx88-dvb.c, which prevents noise coming from the
    analog tuner (via an audio patch cable from the pci card to the sound
    hardware) when in digital mode by muting the tda988x.  This issue does
    not apply to this USB hybrid chip design, where a single piece of
    silicon handles both analog and digital demodulation.
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 2f1a1c7f9c10a87a6725e4b9603e4880c2059d71
Author: Michael Krufky <mkrufky@linuxtv.org>
Date:   Sun May 25 13:09:51 2008 -0300

    V4L/DVB (7916): dib7000p: fix dib7000p_attach when !CONFIG_DVB_DIB7000P
    
    somebody forgot to to fix this header...
    
    Thanks to Ingo Molnar for pointing this out.
    
    Tested-by: Ingo Molnar <mingo@elte.hu>
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 70345fbe4a76621808219c506f2480b39131e575
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date:   Thu May 22 19:30:40 2008 -0300

    V4L/DVB (7911): Remove v4l2_video_std_fps prototype declaration
    
    The v4l2_video_std_fps function has been removed by Adrian Bunk in 2004
    but then its prototype re-appeared in include/media/v4l2-dev.h. Remove it.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit b4aba24186d66190b21ab64bf28f22ffc51a9c43
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue May 20 08:02:33 2008 -0300

    V4L/DVB (7910): usb: input layer dependency fixes
    
    testing of the -tip tree found the following build failures on
    2.6.26-rc3:
    
      drivers/built-in.o: In function `ttusb_dec_disconnect':
      ttusb_dec.c:(.text+0xa2c95): undefined reference to `input_unregister_device'
    
      drivers/built-in.o: In function `dvb_usb_read_remote_control':
      dvb-usb-remote.c:(.text+0xa6a94): undefined reference to `input_event'
    
    with this config:
    
      http://redhat.com/~mingo/misc/config-Tue_May_20_03_48_57_CEST_2008.bad
    
    these are due to the media/dvb/usb layer having dependencies on INPUT
    functionality, without having that spelled out in the Kconfig file.
    
    this patch makes that dependency explicit (for the drivers affected),
    which solves the build error.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 45033bcf172d9965210b644f3769c9de94c33333
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon May 26 14:23:49 2008 -0300

    V4L/DVB (7908): always enter drivers/media/video/
    
    After commit 039d40019f3c5e26ea50ec5af4270189f63365e1
    (V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic)
    VIDEO_MEDIA is no longer usable in Makefile's for deciding
    which directories we enter, resulting in compile errors like the
    following with CONFIG_VIDEO_DEV=y, CONFIG_DVB_CORE=m:
    
    <--  snip  -->
    
    ...
      MODPOST 187 modules
    ...
    make[2]: *** [__modpost] Error 1
    
    <--  snip  -->
    
    The easiest solution is to always enter video/
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 38db143e6feaa2dc649ed8bf69d1a12f7b9c0246
Author: Adrian Bunk <bunk@kernel.org>
Date:   Fri May 16 00:15:53 2008 -0300

    V4L/DVB (7906): tuners/mxl5005s.c: don't define variables for enums
    
    It doesn't seem to be intended that "tuner_modu_type" and
    "MXL5005_ControlName" were global variables.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 427aad6fda607914945022e916827037d2d0db3d
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Sun May 11 19:58:59 2008 -0300

    V4L/DVB (7905): check_v4l2 should return -EINVAL on error
    
    check_v4l2 always returns 0, so this change is an noop for now,
    but a comment says it will return something else in the future
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 4d3437df25325d517ee310d55989ce9630ff529e
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Mon May 26 14:03:02 2008 -0300

    V4L/DVB (7904): v4l/tuner-core: consistent handling of return values
    
    change check_mode and set_mode to return negative errors and fix all callers
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 7fa7b8583f14889aaceebcd8dca3093987e289f7
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Sun May 11 19:53:39 2008 -0300

    V4L/DVB (7903): gp8psk_power_ctrl should return negative errors
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 4277106b4fb6edd8f52b0653841faebbf7160480
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Sun May 11 19:51:07 2008 -0300

    V4L/DVB (7902): fix handling of tea5761_autodetection return value
    
    tea5761_autodetection returns -EINVAL on error
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 81b8021a71c194752e8bbb29328cecc744a47b2b
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Wed May 14 23:14:04 2008 -0300

    V4L/DVB (7901): zoran: use correct type for CPU flags
    
    locking-add-typecheck-on-irqsave-and-friends-for-correct-flags.patch will cause
    
    drivers/media/video/zoran_driver.c: In function 'zoran_close_end_session':
    drivers/media/video/zoran_driver.c:1172: warning: comparison of distinct pointer types lacks a cast
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit daf20d95bff81c6fc8a8d8160e620e1f9581af02
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon May 12 11:21:58 2008 -0300

    V4L/DVB (7885): ivtv/cx18: add compat_ioctl entries
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit ba75321193900a236bc5bbc29145e1039f74eb1b
Author: Kyungmin Park <kyungmin.park@samsung.com>
Date:   Wed May 7 11:54:10 2008 +0900

    [MTD] [MAPS] Fix cmdlineparse handling in mapping files
    
    Now it returns the 0 if cmdlineparse not supplied.
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

commit 9b62d864314736fb6cc5c5db5b964d4a3c093424
Author: Eric Miao <eric.miao@marvell.com>
Date:   Wed May 21 17:26:15 2008 +0800

    [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path
    
    Signed-off-by: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>

commit 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date:   Mon Jun 2 20:38:15 2008 +0100

    [ARM] pxa: fix tosa.c build error
    
    Work around:
    arch/arm/mach-pxa/tosa.c: In function `tosa_poweroff':
    arch/arm/mach-pxa/tosa.c:470: error: `GPIO_OUT' undeclared (first use in this function)
    arch/arm/mach-pxa/tosa.c:470: error: (Each undeclared identifier is reported only once
    arch/arm/mach-pxa/tosa.c:470: error: for each function it appears in.)
    
    The proper fix exists in the PXA branch of my kernel git tree, which
    will be pushed during the next merge window.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 1e5c594607778f551b729577b046ee5d9333cfb5
Author: surinder <srplsnh@gmail.com>
Date:   Wed May 28 09:51:16 2008 +0100

    [ARM] 5067/1: _raw_write_can_lock macro bugfix
    
    The current __raw_write_can_lock macro tests whether the lock can be
    locked by checking if it is equal to 0x80000000, whereas the lock
    should be lockable if its value is 0 i.e. unlocked state is
    represented by 0. Hence the macro should test the value of lock
    against 0 and not 0x80000000.
    
    Signed-off-by: Surinder Pal Singh <srplsnh@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit ea6a7404da4b381b35bcec48338d376a3873ea46
Author: Philipp Zabel <philipp.zabel@gmail.com>
Date:   Fri May 30 18:53:55 2008 +0100

    [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
    
    PSKTSEL can be routed to GPIO pin 104. This configuration is used by
    HP iPAQ hx4700.
    
    Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
    Acked-by: Jrgen Schindele <linux@schindele.name>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 106f62701fe79fd5c251e5d3e182516344882962
Author: Jonathan Cameron <jic23@cam.ac.uk>
Date:   Wed May 28 18:37:14 2008 +0100

    [ARM] 5068/1: PXA2xx Additional gpio definitions
    
    Some additional alternate gpio definitions relating
    to FFUART and USB on the pxa27x. These are used on
    the xbow imote2 platform.
    
    Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 31ab3ffb2b20cda79684a0b3a4265fd7170cdacc
Author: Mike Rapoport <mike@compulab.co.il>
Date:   Mon Jun 2 12:58:23 2008 +0100

    [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
    
    Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource
    to stop the driver itself complaining it was not given
    any flags to use.
    
    Signed-off-by: Mike Rapoport <mike@compulab.co.il>
    Acked-by: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit b095723526cb80494bd5a13de0e5078f8846866a
Author: Mike Rapoport <mike@compulab.co.il>
Date:   Mon Jun 2 12:58:24 2008 +0100

    [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
    
    Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource
    to stop the driver itself complaining it was not given
    any flags to use.
    
    Signed-off-by: Mike Rapoport <mike@compulab.co.il>
    Acked-by: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 6d2545738a7c6ad1831d84ecc6483ea21c327bf4
Author: eric miao <eric.y.miao@gmail.com>
Date:   Mon May 26 03:23:14 2008 +0100

    [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
    
    Signed-off-by: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 759e9408ad2e7f2115ce8341854be982e0186a8c
Author: Greg Ungerer <gerg@snapgear.com>
Date:   Sun May 25 12:35:38 2008 +0100

    [ARM] 5060/1: remove unnecessary include of asm/io.h
    
    Remove unnecessary include of asm/io.h.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit ee48a75c95145bf6af3be329cd7cbbca2ec89a2a
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date:   Sun Jun 1 11:19:33 2008 +0100

    [ARM] fix AT91 include loops
    
    AT91 has one include loop in its header files:
    
      include/asm-arm/io.h <- include/asm-arm/arch-at91/io.h <-
       include/asm-arm/io.h
    
    Circular include dependencies are dangerous since they can result in
    inconsistent definitions being provided to other code, especially if
    '#ifndef' constructs are used.
    
    Solve this by removing the offending includes.  Built tested using my
    AT91 configuration.
    
    Acked-by: Andrew Victor <linux@maxim.org.za>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit ca05a99a54db1db5bca72eccb5866d2a86f8517f
Author: Andrew G. Morgan <morgan@kernel.org>
Date:   Tue May 27 22:05:17 2008 -0700

    capabilities: remain source compatible with 32-bit raw legacy capability support.
    
    Source code out there hard-codes a notion of what the
    _LINUX_CAPABILITY_VERSION #define means in terms of the semantics of the
    raw capability system calls capget() and capset().  Its unfortunate, but
    true.
    
    Since the confusing header file has been in a released kernel, there is
    software that is erroneously using 64-bit capabilities with the semantics
    of 32-bit compatibilities.  These recently compiled programs may suffer
    corruption of their memory when sys_getcap() overwrites more memory than
    they are coded to expect, and the raising of added capabilities when using
    sys_capset().
    
    As such, this patch does a number of things to clean up the situation
    for all. It
    
      1. forces the _LINUX_CAPABILITY_VERSION define to always retain its
         legacy value.
    
      2. adopts a new #define strategy for the kernel's internal
         implementation of the preferred magic.
    
      3. deprecates v2 capability magic in favor of a new (v3) magic
         number. The functionality of v3 is entirely equivalent to v2,
         the only difference being that the v2 magic causes the kernel
         to log a "deprecated" warning so the admin can find applications
         that may be using v2 inappropriately.
    
    [User space code continues to be encouraged to use the libcap API which
    protects the application from details like this.  libcap-2.10 is the first
    to support v3 capabilities.]
    
    Fixes issue reported in https://bugzilla.redhat.com/show_bug.cgi?id=447518.
    Thanks to Bojan Smojver for the report.
    
    [akpm@linux-foundation.org: s/depreciate/deprecate/g]
    [akpm@linux-foundation.org: be robust about put_user size]
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
    Cc: Serge E. Hallyn <serue@us.ibm.com>
    Cc: Bojan Smojver <bojan@rexursive.com>
    Cc: stable@kernel.org
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>

commit cc94bc37d5e02aaf8a6409a28e3c62bbd479b9a8
Author: Chris Wright <chrisw@sous-sol.org>
Date:   Mon May 19 14:58:43 2008 -0700

    LSM: remove stale web site from MAINTAINERS
    
    Pointed out by Adrian Bunk.
    
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>

commit 5f6256066790e1a9a90438f5eece73069c531ffc
Author: Chien Tung <ctung@neteffect.com>
Date:   Mon May 26 15:23:32 2008 -0700

    MAINTAINERS: Update NetEffect (iw_nes) entry
    
    Add Chien and remove Nishi from maintainers list for NetEffect.
    
    Signed-off-by: Chien Tung <ctung@neteffect.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit 03031f71c7e64aada1add057ccc4a8bc6a79924c
Author: Ralph Campbell <ralph.campbell@qlogic.com>
Date:   Mon May 26 15:22:17 2008 -0700

    IB/ipath: Fix device capability flags
    
    The driver supports a few features (RNR NAK, port active event, SRQ
    resize) that were not reported in the device capability flags.  This
    patch fixes that.
    
    Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit e8ffef73c8dd2c2d00287829db87cdaf229d3859
Author: Roland Dreier <rolandd@cisco.com>
Date:   Mon May 26 15:20:34 2008 -0700

    IB/ipath: Avoid test_bit() on u64 SDMA status value
    
    Gabriel C <nix.or.die@googlemail.com> pointed out that when the x86
    bitops are updated to operate on unsigned long, the code in
    sdma_abort_task() will produce warnings:
    
        drivers/infiniband/hw/ipath/ipath_sdma.c: In function 'sdma_abort_task':
        drivers/infiniband/hw/ipath/ipath_sdma.c:267: warning: passing argument 2 of 'constant_test_bit' from incompatible pointer type
    
    and so on, because it uses test_bit() to operation on a u64 value
    (returned by ipath_read_kref64() for a hardware register).
    
    Fix up these warnings by converting the test_bit() operations to &ing
    with appropriate symbolic defines of the bits within the hardware
    register.  This has the benign side-effect of making the code more
    self-documenting as well.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>