commit 685d87f7ccc649ab92b55e18e507a65d0e694eb9
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Aug 6 19:24:47 2008 -0700

    Revert "pcm_native.c: remove unused label"
    
    This reverts commit 680db0136e0778a0d7e025af7572c6a8d82279e2.  The label
    is actually used, but hidden behind CONFIG_SND_DEBUG and the horrible
    snd_assert() macro.
    
    That macro could probably be improved to be along the lines of
    
    	#define snd_assert(expr, args...) do { if ((void)(expr),0) { args; } } while (0)
    
    or similar to make sure that we always both evaluate 'expr' and parse
    'args', but while gcc should optimize it all away, I'm too lazy to
    really verify that.  So I'll just admit defeat and will continue to live
    with the annoying warning.
    
    Noted-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Linus "Grr.." Torvalds

commit f99e8f277f1172c49ac7b0585aed5b094fe235d4
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Aug 6 17:36:23 2008 -0700

    iSeries: Fix up viotty_ioctl BKL locking fallout
    
    The bogus code to call into the n_tty layer got removed in commit
    8bc5fb6abb670fa9079cd1994f016a39f99698fe ("Remove bogons from the
    iSeries console"), but it left a now uninitialized "return ret;" around.
    
    Not that this code has ever even compiled since the BKL pushdown, since
    not only is "ret" no longer initialized, it was never actually declared
    even originally.
    
    Replace it with a "return -ENOIOCTLCMD"
    
    Pointed-out-by: Paul Mackerras <paulus@samba.org>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 680db0136e0778a0d7e025af7572c6a8d82279e2
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Aug 6 15:14:13 2008 -0700

    pcm_native.c: remove unused label
    
    This fixes the warning
    
      sound/core/pcm_native.c: In function 'snd_pcm_fasync':
      sound/core/pcm_native.c:3262: warning: label 'out' defined but not used
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 970a8a513c30a1c3e8995609a153658a34bc02bf
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Wed Aug 6 22:19:39 2008 +0200

    m68k/amiserial: fix fallout of tty break handling rework
    
    commit 9e98966c7bb94355689478bc84cc3e0c190f977e (tty: rework break handling)
    forgot to update one exit point of rs_break() in the Amiga serial driver.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2e4f40d2eb763a17c75c07fff605402737260c59
Merge: d660668... e34a8ae...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Aug 6 12:07:36 2008 -0700

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      async_tx: fix missing braces in async_xor_zero_sum

commit d6606683a5e3dac35cb979c7195f54ed827567bd
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Aug 6 12:04:54 2008 -0700

    Revert duplicate "mm/hugetlb.c must #include <asm/io.h>"
    
    This reverts commit 7cb93181629c613ee2b8f4ffe3446f8003074842, since we
    did that patch twice, and the problem was already fixed earlier by
    78a34ae29bf1c9df62a5bd0f0798b6c62a54d520.
    
    Reported-by: Andi Kleen <andi@firstfloor.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a14ad05f47b55ea84136eb4da43ea96fa469326a
Merge: 0016fe9... 8401d92...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Aug 6 12:03:43 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: Preserve response data alignment bug when it is harmless

commit 0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b
Merge: 8bc5fb6... bcbd2b6...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Aug 6 11:46:39 2008 -0700

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Update generic config
      [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU
      [IA64] Eliminate trailing backquote in IA64_SGI_UV
      [IA64] update generic_defconfig to support sn2.
      [IA64] update generic_defconfig for 2.6.27-rc1
      [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096
      [IA64] Cleanup generated file not ignored by .gitignore
      [IA64] pv_ops: fix ivt.S paravirtualization

commit 8bc5fb6abb670fa9079cd1994f016a39f99698fe
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Wed Aug 6 14:06:29 2008 +0100

    Remove bogons from the iSeries console
    
    The iSeries driver calls into the n_tty ldisc code directly for some
    bizarre reason. I previously tagged this with a query but this actually
    does need fixing as n_tty methods when you have a different ldisc set are
    not a good thing to call.
    
    In n_tty mode this change should have no effect, the core tty layer has
    always called the ldisc ioctl method *anyway* and will call the one for
    the right ldisc.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3a35c27ac68cea19c252e127ec61099648eb4870
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Wed Aug 6 10:08:56 2008 -0700

    docbook: fix v4l fatal filename error
    
    docproc: /var/linsrc/lin2627-rc2/drivers/media/video/videodev.c: No such file or directory
    make[1]: *** [Documentation/DocBook/videobook.xml] Error 1
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    cc: mchehab@infradead.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e34a8ae79056e6cea4a1ac21119ee3c91f378f99
Author: Dan Williams <dan.j.williams@intel.com>
Date:   Tue Aug 5 10:22:05 2008 -0700

    async_tx: fix missing braces in async_xor_zero_sum
    
    Found-by: Yuri Tikhonov <yur@emcraft.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>

commit bcbd2b65868213c1426654304de3da330cde6b3a
Author: Tony Luck <tony.luck@intel.com>
Date:   Mon Aug 4 15:47:25 2008 -0700

    [IA64] Update generic config
    
    Changes to support a new platform in my lab.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit ee694d6b4106ca09dcf23f839b44efd152a1da82
Author: Tony Luck <tony.luck@intel.com>
Date:   Mon Aug 4 13:39:28 2008 -0700

    [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU
    
    The SGI XP and GRU drivers only work on SMP systems ... the Kconfig
    file only disallowed them for non-SMP X86.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 3351ab9b345ba5c2872acbf718cc631df72d3732
Author: Jack Steiner <steiner@sgi.com>
Date:   Thu Jul 31 07:52:50 2008 -0500

    [IA64] Eliminate trailing backquote in IA64_SGI_UV
    
    Eliminate trailing backquote in IA64_SGI_UV config.
    
    Signed-off-by: Jack Steiner <steiner@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit ceffacc1d6041392d1b47750b14bf6845c2372ab
Author: Robin Holt <holt@sgi.com>
Date:   Sat Aug 2 13:35:27 2008 -0500

    [IA64] update generic_defconfig to support sn2.
    
    This patch changes the generic_defconfig so it works on all sn2
    platforms I have access to.  There is only one support configuration
    which was not tested and that configuration is only a combination of two
    tested configurations.  With this patchset applied, a generic kernel can
    be booted on either a RHEL 5.2, RHEL5.3, or SLES10 SP1 root and operate.
    All features needed by SGI's ProPack are also working.  I have not
    tested all features of RHEL or SLES, but they do at least boot.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit ac0af91ebcaedc1a9e1d2987ecbd22837924e6b9
Author: Robin Holt <holt@sgi.com>
Date:   Sat Aug 2 13:32:06 2008 -0500

    [IA64] update generic_defconfig for 2.6.27-rc1
    
    This patch updates the generic_defconfig for 2.6.27-rc1 by simply doing
    a make oldconfig and holding down the carriage return.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit d1339df1f46d10e0396c1470f371b0d1b23295ba
Author: Robin Holt <holt@sgi.com>
Date:   Sat Aug 2 13:29:24 2008 -0500

    [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096
    
    ia64 has compiled with NR_CPUS=4096 for a couple releases, just forgot
    to update Kconfig to allow it.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 94567ef16bf38e98a7de214694d327feb3ec42d4
Author: Robin Holt <holt@sgi.com>
Date:   Mon Aug 4 11:06:16 2008 -0700

    [IA64] Cleanup generated file not ignored by .gitignore
    
    arch/ia64/kernel/vmlinux.lds is a generated file. Tell
    git to ignore it.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 9b3cbf725fb98733976fd02e2e557f0ae3028df0
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Aug 4 12:02:28 2008 +0900

    [IA64] pv_ops: fix ivt.S paravirtualization
    
    Recent kernels are not booting on some HP systems (though
    it does boot on others). James and Willy reported the
    problem.  James did the bisection to find the commit
    that caused the problem:
    	498c5170472ff0c03a29d22dbd33225a0be038f4.
    	[IA64] pvops: paravirtualize ivt.S
    
    Two instructions were wrongly paravirtualized such that
    _FROM_ macro had been used where _TO_ was intended
    
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: "Wilcox, Matthew  R" <matthew.r.wilcox@intel.com>
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 8401d92ba46a1e859464cbd9c9ee304f6e361da3
Author: David Moore <dcm@acm.org>
Date:   Tue Jul 29 23:46:25 2008 -0700

    firewire: Preserve response data alignment bug when it is harmless
    
    Recently, a bug having to do with the alignment of transaction response
    data was fixed.  However, some apps such as libdc1394 relied on the
    presence of that bug in order to function correctly.  In order to stay
    compatible with old versions of those apps, this patch preserves the bug
    in cases where it is harmless to normal operation (such as the single
    quadlet read) due to a simple duplication of data.  This guarantees
    maximum compatability for those users who are using the old app with the
    fixed kernel.
    
    Signed-off-by: David Moore <dcm@acm.org>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>