commit 5717922a1b8cc477f45a0f4f11fe619392ba7133
Merge: 50f7ad2... e024cbd...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 5 10:17:30 2008 -0700

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdb: kconfig fix xconfig/menuconfig element
      kgdb: fix signedness mixmatches, add statics, add declaration to header
      kgdb: 1000 loops for the single step test in kgdbts
      kgdb: trivial sparse fixes in kgdb test-suite
      kgdb: minor documentation fixes

commit 50f7ad2500b27ce5c42be3a6936f143b158f7bc3
Merge: 82af7ac... 2c36eec...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 5 10:16:42 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:
      [ALSA] soc - fix S3C2410 i2s programming error
      [ALSA] soc - fix s3c2410 PCM breakage
      [ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
      [ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
      [ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
      [ALSA] hda - Support IDT 92HD206 codec
      [ALSA] pcsp: Fix build with CONFIG_PM=n

commit 82af7aca56c67061420d618cc5a30f0fd4106b80
Author: Eric Sesterhenn <snakebyte@gmx.de>
Date:   Fri Jan 25 10:40:46 2008 +0100

    Removal of FUTEX_FD
    
    Since FUTEX_FD was scheduled for removal in June 2007 lets remove it.
    
    Google Code search found no users for it and NGPT was abandoned in 2003
    according to IBM.  futex.h is left untouched to make sure the id does
    not get reassigned.  Since queue_me() has no users left it is commented
    out to avoid a warning, i didnt remove it completely since it is part of
    the internal api (matching unqueue_me())
    
    Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (removed rest)
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e024cbd257efc2788b7d21b9353e966267485c87
Author: Jan Engelhardt <jengelh@computergmbh.de>
Date:   Fri Apr 25 18:35:29 2008 +0200

    kgdb: kconfig fix xconfig/menuconfig element
    
    Kconfig.kgdb: fix menuconfig element
    
    Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

commit 688b744d8bc84dc5cc646e97509113dc5e8818ed
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu Apr 24 16:57:23 2008 -0500

    kgdb: fix signedness mixmatches, add statics, add declaration to header
    
    Noticed by sparse:
    arch/x86/kernel/kgdb.c:556:15: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
    kernel/kgdb.c:149:8: warning: symbol 'kgdb_do_roundup' was not declared. Should it be static?
    kernel/kgdb.c:193:22: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
    kernel/kgdb.c:712:5: warning: symbol 'remove_all_break' was not declared. Should it be static?
    
    Related to kgdb_hex2long:
    arch/x86/kernel/kgdb.c:371:28: warning: incorrect type in argument 2 (different signedness)
    arch/x86/kernel/kgdb.c:371:28:    expected long *long_val
    arch/x86/kernel/kgdb.c:371:28:    got unsigned long *<noident>
    kernel/kgdb.c:469:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:469:27:    expected long *long_val
    kernel/kgdb.c:469:27:    got unsigned long *<noident>
    kernel/kgdb.c:470:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:470:27:    expected long *long_val
    kernel/kgdb.c:470:27:    got unsigned long *<noident>
    kernel/kgdb.c:894:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:894:27:    expected long *long_val
    kernel/kgdb.c:894:27:    got unsigned long *<noident>
    kernel/kgdb.c:895:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:895:27:    expected long *long_val
    kernel/kgdb.c:895:27:    got unsigned long *<noident>
    kernel/kgdb.c:1127:28: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:1127:28:    expected long *long_val
    kernel/kgdb.c:1127:28:    got unsigned long *<noident>
    kernel/kgdb.c:1132:25: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:1132:25:    expected long *long_val
    kernel/kgdb.c:1132:25:    got unsigned long *<noident>
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

commit 7cfcd985d36031459cc64e3843ea36a4d801097d
Author: Jason Wessel <jason.wessel@windriver.com>
Date:   Thu Apr 24 16:57:23 2008 -0500

    kgdb: 1000 loops for the single step test in kgdbts
    
    The single step test is not terribly costly and it should be able to
    pass at 1000 loops successfully in under 1 second.  A non-kgdb timing
    regression was found using this test, but it did not occur frequently
    because by default the test was only executed a single time.
    
    This patch changes the default for the single step test to 1000
    iterations and allows for individual configuration of the single step
    test to further exercise the kgdb subsystem when needed.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

commit 001fddf5fdcfe2c08ac9c4e5ca80c5e5698363bb
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu Apr 24 16:57:23 2008 -0500

    kgdb: trivial sparse fixes in kgdb test-suite
    
    Shadowed variable and integer as NULL pointer fixes:
    drivers/misc/kgdbts.c:877:6: warning: symbol 'sys_open_test' shadows an earlier one
    drivers/misc/kgdbts.c:537:27: originally declared here
    drivers/misc/kgdbts.c:378:22: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:386:22: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:468:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:472:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:502:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:506:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:509:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:523:20: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:527:20: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:530:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:541:21: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:545:21: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:548:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:559:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:563:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:573:16: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:574:19: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:578:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:588:16: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:589:19: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:593:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:602:16: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:604:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:925:3: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:938:3: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

commit f92509371ec06227a7e29778f395776d31b0deab
Author: grzegorz.chwesewicz@chilan.com <grzegorz.chwesewicz@chilan.com>
Date:   Thu Apr 24 16:57:22 2008 -0500

    kgdb: minor documentation fixes
    
    Two minor fixes to the kgdb documentation.
    
    Signed-off-by: Grzegorz Chwesewicz, Chilan <grzegorz.chwesewicz@chilan.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

commit 2c36eecfb6471c457994647771d1405502ad5fde
Author: Davide Rizzo <davide@elpa.it>
Date:   Mon May 5 14:59:39 2008 +0200

    [ALSA] soc - fix S3C2410 i2s programming error
    
    S3C2410 i2s driver currently manages only i2s protocol (and not left
    justified one) and slave mode.
    With this small patch, other modes are possible.
    
    Signed-off-by: Davide Rizzo <davide@elpa.it>
    Acked-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit d6426171bab3403cdcd5613d5549f20b0ab0967c
Author: Davide Rizzo <davide@elpa.it>
Date:   Mon May 5 14:56:07 2008 +0200

    [ALSA] soc - fix s3c2410 PCM breakage
    
    S3C2410 pcm doesn't work.
    s3c2410_dma_request() now returns the channel number and not 0 if OK.
    
    Signed-off-by: Davide Rizzo <davide@elpa.it>
    Acked-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 2e75d050e42d1c61e820f9a35078a2f69e02cc3e
Author: Takashi Iwai <tiwai@suse.de>
Date:   Sat May 3 18:46:56 2008 +0200

    [ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
    
    On boards with VT1617A codec, the sound disappears suddenly.
    This looks like a problem with HPE-bit control that is supposed to be
    set in patch_vt1617a().  However, on such problematic hardwares, the
    bit is actually reset mysteriously.
    
    The patch adds a workaround for the wrong quirk.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 564c5bead424fa798dfbd5fe382b4e0b7ea483fb
Author: Jacek Luczak <luczak.jacek@gmail.com>
Date:   Sat May 3 18:41:23 2008 +0200

    [ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
    
    Change done by:
            commit f6c7e5461e9046445d50c5c7a9a4587824239623
            [ALSA] hda-codec - Fix auto-configuration of Realtek codecs
    broke sound on ALC861 Analog.
    
    Signed-off-by: Jacek Luczak <luczak.jacek@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 20686c24377246d9eb57782551b25ff19df09873
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri May 2 12:31:51 2008 +0200

    [ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
    
    FM801-tea575x tuner has a reverse selection to V4L1 and this causes
    nasty dependency problems.
    
    The patch simplifies the dependency with a normal
    "depends on VIDEO_V4L1".  This decreases the usability but fixes bugs,
    yeah.  If any better feature like "requires" is introduced to kbuild
    in future, we'll be able to switch it...
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 7bd3c0f73c9c5b47fd1ca49757c436e73f4cd55b
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri May 2 12:28:02 2008 +0200

    [ALSA] hda - Support IDT 92HD206 codec
    
    Added the support for IDT 92HD206 codec chip.
    It's compatible with STAC927x.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 983e0972cea450fe5725d1ba11c78adfd5d7ad3a
Author: Johann Felix Soden <johfel@users.sourceforge.net>
Date:   Fri May 2 09:54:31 2008 +0200

    [ALSA] pcsp: Fix build with CONFIG_PM=n
    
    sound/drivers/pcsp/pcsp.c: In function 'pcsp_suspend':
    sound/drivers/pcsp/pcsp.c:201: error: implicit declaration of function 'snd_pcm_suspend_all'
    
    Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net>
    CC: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit f74d505b58d36ceeef10e459094f0eb760681165
Merge: 45ea210... 2961b42...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 4 17:12:10 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
      fix asm-mips/types.h syntax error
      fix asm-alpha/types.h breakage

commit 45ea2103d8856454503b30464cc1dba378748d00
Merge: 10ea18f... 6217984...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 4 17:11:43 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
      x86: fix setup printk format warning
      x86: olpc build fix
      x86: video/fbdev.c: add MODULE_LICENSE
      x86: fix up bootparam.h for userspace inclusion
      x86: relocs ELF handling - use SELFMAG instead of numeric constant
      x86: vdso ELF handling - use SELFMAG instead of numeric constant
      x86: remove dell reboot dmi quirk board name match
      x86: es7000 build fix
      x86: make additional_cpus static
      x86: make start_secondary() static
      kbuild, suspend, x86: fix rebuild of wakeup.bin
      uml: fix gcc problem
      x86: undo visws/numaq build changes

commit 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b
Merge: eb28062... 2cb1e12...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 4 17:11:24 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
      kconfig-language.txt: remove bogus hint
      kconfig: fix MAC OS X warnings in menuconfig
      modpost: i2c aliases need no trailing wildcard

commit eb28062f131b0a1da32b2554fd819af5221040de
Author: Bryan Wu <cooloney@kernel.org>
Date:   Sun May 4 23:12:55 2008 +0800

    task_nommu: fix compile failing bug because of spilt file.h
    
      CC      fs/proc/task_nommu.o
    fs/proc/task_nommu.c: In function ‘task_mem’:
    fs/proc/task_nommu.c:55: error: dereferencing pointer to incomplete type
    make[2]: *** [fs/proc/task_nommu.o] Error 1
    make[1]: *** [fs/proc] Error 2
    make: *** [fs] Error 2
    
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d0dcd41d7b463de955b7ae7a55f76ff4216ed665
Merge: 8dcf578... 1024c5f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 4 17:08:21 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      ide: IDE_HFLAG_SERIALIZE_DMA bugfix

commit 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e
Merge: e73b65f... b8ba5f1...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 4 17:07:28 2008 -0700

    Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
    
    * 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
      x86: KVM geust: make setup_secondary_clock definition dependent on local apic
      KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
      KVM: avoid fx_init() schedule in atomic
      KVM: Avoid spurious execeptions after setting registers
      KVM: PIT: support mode 4
      KVM: x86 emulator: disable writeback on lmsw
      KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
      KVM: ppc: Handle guest idle by emulating MSR[WE] writes
      KVM: x86: task switch: fix wrong bit setting for the busy flag
      KVM: VMX: Enable EPT feature for KVM
      KVM: VMX: Prepare an identity page table for EPT in real mode
      KVM: Export necessary function for EPT
      KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
      KVM: MMU: Add EPT support
      KVM: Add kvm_x86_ops get_tdp_level()
      KVM: MMU: Move some definitions to a header file
      KVM: VMX: EPT Feature Detection

commit e73b65f1db7e3baa3db43951476b7d2d2381ba35
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun May 4 09:29:43 2008 +0200

    sysfs: build fix
    
    x86.git testing found the following build failure on v2.6.26-rc1:
    
      In file included from include/linux/kobject.h:22,
                       from include/linux/module.h:17,
                       from include/linux/crypto.h:22,
                       from arch/x86/kernel/asm-offsets_32.c:8,
                       from arch/x86/kernel/asm-offsets.c:3:
      include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group'
      include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here
      make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
      make: *** [prepare0] Error 2
    
    with the following config:
    
        http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
    
    the reason for the build failure is the duplicate definition of the
    sysfs_update_group() inline function in include/linux/sysfs.h.
    
    The duplication was a merge error: it was added via -mm by commit
    v2.6.25-7262-g2850699, "sysfs: sysfs_update_group stub for
    CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same
    commit was already merged upstream via the sysfs tree, with commit
    v2.6.25-7211-g1cbfb7a.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 826e4506a0acb6487910a5ebafe839f708a00e1c
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 4 17:04:16 2008 -0700

    Make forced module loading optional
    
    The kernel module loader used to be much too happy to allow loading of
    modules for the wrong kernel version by default.  For example, if you
    had MODVERSIONS enabled, but tried to load a module with no version
    info, it would happily load it and taint the kernel - whether it was
    likely to actually work or not!
    
    Generally, such forced module loading should be considered a really
    really bad idea, so make it conditional on a new config option
    (MODULE_FORCE_LOAD), and make it default to off.
    
    If somebody really wants to force module loads, that's their problem,
    but we should not encourage it.  Especially as it happened to me by
    mistake (ie regular unversioned Fedora modules getting loaded) causing
    lots of strange behavior.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2961b423037da60a8cb230963ee0d8c04473d73b
Author: Adrian Bunk <bunk@kernel.org>
Date:   Sat May 3 22:26:17 2008 +0300

    fix asm-mips/types.h syntax error
    
    This patch fixes the following compile error caused by
    commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
    (mips: types: use <asm-generic/int-*.h> for the mips architecture):
    
    <--  snip  -->
    
    ...
      CC      kernel/bounds.s
    In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
    include2/asm/types.h:56:2: error: #endif without #if
    make[2]: *** [kernel/bounds.s] Error 1
    
    <--  snip  -->
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>

commit 36bbfe2f097d5e09e8e9c83f55264bd538a0ebe1
Author: Adrian Bunk <bunk@kernel.org>
Date:   Sat May 3 23:51:03 2008 +0300

    fix asm-alpha/types.h breakage
    
    This patch fixes the following compile error on alpha caused by
    commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
    (alpha: types: use <asm-generic/int-*.h> for the alpha architecture):
    
    <--  snip  -->
    
    ...
      CC      arch/alpha/kernel/asm-offsets.s
    In file included from include2/asm/topology.h:6,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
    include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
    include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
    In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
    include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
    include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
    include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
    make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1
    
    <--  snip  -->
    
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>

commit 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
Author: Adrian Bunk <bunk@kernel.org>
Date:   Sun May 4 02:15:35 2008 +0300

    kconfig-language.txt: remove bogus hint
    
    For the use case the hint describe a simple dependency is
    enough.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

commit c4143a83031aef7ba87a62cf654d6d8fb4d8e76e
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Sun May 4 21:03:20 2008 +0200

    kconfig: fix MAC OS X warnings in menuconfig
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Timur Tabi <timur@freescale.com>

commit 62179849b40aded9e727cca5006627a1c4d6446e
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Fri May 2 13:32:35 2008 -0700

    x86: fix setup printk format warning
    
    Fix x86 setup printk format warming:
    
    next-20080430/arch/x86/kernel/setup.c:172: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ssize_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: mingo@elte.hu
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit e26a28d190304d910ee49b81cbfe6d9241f56e86
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Sat May 3 23:49:59 2008 +0200

    x86: olpc build fix
    
    CONFIG_OLPC needs to depend on MGEODE_LX
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 7b04fa014c11e6415da8b5a7999dbd201abad53c
Author: Adrian Bunk <bunk@kernel.org>
Date:   Fri May 2 13:32:32 2008 -0700

    x86: video/fbdev.c: add MODULE_LICENSE
    
    Add the missing MODULE_LICENSE("GPL").
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit afaafe50ee15c59010f19273ebfb6c44f0962d7c
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 2 21:14:20 2008 +1000

    x86: fix up bootparam.h for userspace inclusion
    
    commit 8b664aa66e824a0ddf4ec56d41fa0cf7bb374de6 (x86, boot: add linked
    list of struct setup_data) put a new struct in bootparam.h, but didn't
    use the userspace-safe types.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Huang Ying <ying.huang@intel.com>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 8bd1796dedd50abd7553afbe6113bd97cc88390f
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Sat May 3 14:18:03 2008 +0400

    x86: relocs ELF handling - use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: akpm@linux-foundation.org
    Cc: hpa@zytor.com
    Cc: mingo@elte.hu
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ecb783eae1372d69a53d406e1bdba8284e4bafcc
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Sat May 3 14:18:01 2008 +0400

    x86: vdso ELF handling - use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: akpm@linux-foundation.org
    Cc: hpa@zytor.com
    Cc: mingo@elte.hu
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 163ea310b68bdde89b1ac633fbf8c0db290d3f86
Author: Ben <bdeb@willmore.eu>
Date:   Sat May 3 22:39:42 2008 +0200

    x86: remove dell reboot dmi quirk board name match
    
    http://bugzilla.kernel.org/show_bug.cgi?id=10547
    
    Newer Dell OptiPlex 745s hang before rebooting after 'sudo reboot'.
    
    A patch for some versions of the OptiPlex was proposed here --
    http://lkml.org/lkml/2007/6/5/59 -- and is included in 2.6.23 and
    later kernels, according to
    http://lxr.linux.no/linux+v2.6.23/arch/i386/kernel/reboot.c . However,
    the DMI_BOARD_NAME ("0WF810") is too restrictive. Newer OptiPlex
    machines have a DMI_BOARD_NAME of "0RF703".  I therefore suggest
    adding another clause to reboot.c, similar to the one in the original
    patch, but matching a DMI_BOARD_NAME of "0RF703".
    
    On further inspection, it seems that there are other DMI_BOARD_NAMEs
    for this same machine. They seem to change from time to time, which
    means that the current code is fragile. Moreover, using bios reboot
    should not break non-SFF OptiPlex 745s, and so a reasonable fix is to
    simply drop the match on DMI_BOARD_NAME.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit e37ee42caadab46cec277546099fa2a6207fff0b
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sat May 3 22:01:31 2008 +0200

    x86: es7000 build fix
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit c5562faeaacf19e81a78ee37cc6b96ab1f3e68e4
Author: Adrian Bunk <bunk@kernel.org>
Date:   Tue Apr 22 00:31:37 2008 +0300

    x86: make additional_cpus static
    
    This patch makes the needlessly global additional_cpus static.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit dbe55f4797712f86691a0ee0b5f508693c7310fe
Author: Adrian Bunk <bunk@kernel.org>
Date:   Tue Apr 22 01:50:26 2008 +0300

    x86: make start_secondary() static
    
    start_secondary() needlessly became global.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 4c6214c75a5aca5417156a47cd890b128c5f0637
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Thu May 1 11:31:07 2008 +0200

    kbuild, suspend, x86: fix rebuild of wakeup.bin
    
    In kernel/acpi/realmode/Makefile use the 'always'
    variable to say that wakeup.bin should always
    be made.
    
    In acpi/Makefile we then do not need to specify the
    requested target and we avoid the message from make:
    
       `arch/x86/kernel/acpi/realmode/wakeup.bin' is up to date.
    
    Add wakeup.lds to list af targets to avoid rebuilding
    wakeup.bin - from Roland McGrath.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Pavel Machek <pavel@suse.cz>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Roland McGrath <roland@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 22eecde2f9034764a3fd095eecfa3adfb8ec9a98
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu May 1 12:06:54 2008 +0200

    uml: fix gcc problem
    
    this is what caused gcc 4.3 to throw an internal error when
    OPTIMIZE_INLINING was enabled ...
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 48b83d2425d7781bb625b1c37b5f2a8963b6e23b
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Fri May 2 21:24:30 2008 +0200

    x86: undo visws/numaq build changes
    
    arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
    override the generic pci-y rules. This needs a proper cleanup, but
    that needs more thoughts. Undo
    
    commit 895d30935ebe05f192e844792668bf8d19deaae7
        x86: numaq fix
        do not override the existing pci-y rule when adding visws or
        numaq rules.
    
    There is also a stupid init function ordering problem vs. acpi.o
    
    Add comments to the Makefile to avoid tripping over this again.
    
    Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
    build.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 1024c5f4be4fc5b00337464fb8a442bebf15df68
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Sun May 4 17:03:41 2008 +0200

    ide: IDE_HFLAG_SERIALIZE_DMA bugfix
    
    Patch re-ordering could be harmful:
    
    commit 1fd1890594bd355a4217f5658a34763e77decee3
    Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Date:   Sat Apr 26 22:25:24 2008 +0200
    
        ide: add IDE_HFLAG_SERIALIZE_DMA host flag
    ...
    
    is buggy because ->init_dma method / ide_hwif_setup_dma() is called
    before IDE_HFLAG_SERIALIZE_DMA host flag is checked.
    
    Fix it by checking IDE_HFLAG_SERIALIZE[_DMA] after DMA initialization.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc
Author: Glauber Costa <gcosta@redhat.com>
Date:   Wed Apr 30 12:39:05 2008 -0300

    x86: KVM geust: make setup_secondary_clock definition dependent on local apic
    
    Since the pv_apic_ops are only present if CONFIG_X86_LOCAL_APIC is compiled
    in, kvmclock failed to build without this option.  This patch fixes this.
    
    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 93df766322ba1db2801e4b826985a4932dd75866
Author: Avi Kivity <avi@qumranet.com>
Date:   Fri May 2 13:23:10 2008 +0300

    KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
    
    nonpae guests can call rmap_write_protect twice per page (for page tables)
    or four times per page (for page directories), triggering a bogus warning.
    
    Remove the warning.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit bc1a34f1bf354fabc03e3f465620c80e510d0e8f
Author: Andrea Arcangeli <andrea@qumranet.com>
Date:   Thu May 1 18:43:33 2008 +0200

    KVM: avoid fx_init() schedule in atomic
    
    This make sure not to schedule in atomic during fx_init. I also
    changed the name of fpu_init to fx_finit to avoid duplicating the name
    with fpu_init that is already used in the kernel, this makes grep
    simpler if nothing else.
    
    Signed-off-by: Andrea Arcangeli <andrea@qumranet.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit b4f14abd95cd8d42f08438f1c4ec3eafe41054ee
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date:   Wed Apr 30 17:59:04 2008 +0200

    KVM: Avoid spurious execeptions after setting registers
    
    Clear pending exceptions when setting new register values. This avoids
    spurious exceptions after restoring a vcpu state or after
    reset-on-triple-fault.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit ece15babfa514e06118f62f4df2c757d6209f4f0
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Wed Apr 30 13:23:54 2008 -0300

    KVM: PIT: support mode 4
    
    The in-kernel PIT emulation ignores pending timers if operating under
    mode 4, which for example DragonFlyBSD uses (and Plan9 too, apparently).
    
    Mode 4 seems to be similar to one-shot mode, other than the fact that it
    starts counting after the next CLK pulse once programmed, while mode 1
    starts counting immediately, so add a FIXME to enhance precision.
    
    Fixes sourceforge bug 1952988.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Acked-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit dc7457ea52f88539dc72925360e6068d5c938a0f
Author: Avi Kivity <avi@qumranet.com>
Date:   Wed Apr 30 16:13:36 2008 +0300

    KVM: x86 emulator: disable writeback on lmsw
    
    The recent changes allowing memory operands with lmsw and smsw left
    lmsw with writeback enabled.  Since lmsw has no oridinary destination
    operand, the dst pointer was not initialized, resulting in an oops.
    
    Close the hole by disabling writeback for lmsw.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit de368dceb33c3c068dbde1407aff75cd8e126f04
Author: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Date:   Tue Apr 29 18:18:23 2008 +0200

    KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
    
    This patch adds the delivery of INTERRUPT_FP_UNAVAIL exceptions to the guest.
    It's needed if a guest uses ppc binaries using the Floating point instructions.
    
    Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
    Acked-by: Hollis Blanchard <hollisb@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 45c5eb67da5a668abe79c23a7e64dbc87a600f90
Author: Hollis Blanchard <hollisb@us.ibm.com>
Date:   Fri Apr 25 17:55:49 2008 -0500

    KVM: ppc: Handle guest idle by emulating MSR[WE] writes
    
    This reduces host CPU usage when the guest is idle. However, the guest must
    set MSR[WE] in its idle loop, which Linux did not do until 2.6.26.
    
    Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
    Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 3fe913e7c550a869e250d04c34410f7a6e263f7c
Author: Izik Eidus <izike@qumranet.com>
Date:   Mon Apr 28 18:23:52 2008 +0300

    KVM: x86: task switch: fix wrong bit setting for the busy flag
    
    The busy bit is bit 1 of the type field, not bit 8.
    
    Signed-off-by: Izik Eidus <izike@qumranet.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 1439442c7b257b47a83aea4daed8fbf4a32cdff9
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Mon Apr 28 12:24:45 2008 +0800

    KVM: VMX: Enable EPT feature for KVM
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit b7ebfb0509692cd923e31650f81ed4d79c9a3e59
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Fri Apr 25 21:44:52 2008 +0800

    KVM: VMX: Prepare an identity page table for EPT in real mode
    
    [aliguory: plug leak]
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 0d15029895051904e31925ec63525cc3a637f7de
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Fri Apr 25 21:44:50 2008 +0800

    KVM: Export necessary function for EPT
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 1ac593c97eb229da44819f66fea47975537c1177
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Fri Apr 25 21:44:42 2008 +0800

    KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
    
    Currently EPT level is 4 for both pae and x86_64. The patch remove the #ifdef
    for alloc root_hpa and free root_hpa to support EPT.
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 7b52345e2c4c7333bf7eba8034ffc4683fa63c91
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Fri Apr 25 21:13:50 2008 +0800

    KVM: MMU: Add EPT support
    
    Enable kvm_set_spte() to generate EPT entries.
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 67253af52e9133fb4cfbf7a2448a2d3524d1fa6c
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Fri Apr 25 10:20:22 2008 +0800

    KVM: Add kvm_x86_ops get_tdp_level()
    
    The function get_tdp_level() provided the number of tdp level for EPT and
    NPT rather than the NPT specific macro.
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 8c6d6adc6b87daa364ee9deb2e966021d37a7622
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Fri Apr 25 10:17:08 2008 +0800

    KVM: MMU: Move some definitions to a header file
    
    Move some definitions to mmu.h in order to allow building common table
    entries between EPT and non-EPT.
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit d56f546db97795dca5aa575b00b0e9886895ac87
Author: Sheng Yang <sheng.yang@intel.com>
Date:   Fri Apr 25 10:13:16 2008 +0800

    KVM: VMX: EPT Feature Detection
    
    Signed-off-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit ac551828993eecb8499ef9cc3c828fceb49bcf7a
Author: Jean Delvare <khali@linux-fr.org>
Date:   Fri May 2 20:37:21 2008 +0200

    modpost: i2c aliases need no trailing wildcard
    
    Not all device types need a wildcard at the end of their module
    aliases. In particular, for i2c module aliases, the trailing wildcard
    is not only unneeded, it could also cause the wrong driver to be
    loaded.
    
    As I2C devices have no IDs, i2c module aliases are simple, arbitrary
    device names. For example:
    
    $ /sbin/modinfo lm90
    filename:       /lib/modules/2.6.25-git18/kernel/drivers/hwmon/lm90.ko
    author:         Jean Delvare <khali@linux-fr.org>
    description:    LM90/ADM1032 driver
    license:        GPL
    vermagic:       2.6.25-git18 mod_unload
    depends:        hwmon
    alias:          i2c:lm90*
    alias:          i2c:adm1032*
    alias:          i2c:lm99*
    alias:          i2c:lm86*
    alias:          i2c:max6657*
    alias:          i2c:adt7461*
    alias:          i2c:max6680*
    $
    
    This would cause trouble if one I2C chip name matches the beginning of
    another I2C chip name and both chips are supported by different
    drivers. For example, an i2c device named lm9042 would cause the lm90
    driver to be loaded, while it doesn't support that device. This case
    has yet to be seen in practice, but still, I'd like to fix it now. The
    cleanest fix is to remove the trailing wildcard from i2c module aliases.
    
    Here's a patch doing this.
    
    Not all device type aliases need a trailing wildcard, in particular
    the i2c aliases don't. Don't add a wildcard by default in do_table(),
    instead let each device type handler add it if needed.
    
    I have tested types acpi, dmi, eisa, i2c, ide, ieee1394, input, pci,
    pcmcia, platform, pnp, scsi, serio, ssb and usb. Other types (ccw, of,
    vio, parisc, sdio and virtio) are untested.
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Jochen Friedrich <jochen@scram.de>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit afa26be86b65a7183ceac29bdf1f51d6fc6932f0
Merge: 269f213... 4f95f81...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat May 3 13:51:10 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
      clocksource: allow read access to available/current_clocksource
      clocksource: Fix permissions for available_clocksource
      hrtimer: remove duplicate helper function

commit 269f21344b23e552c21c9e2d7ca258479dcd7a0a
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Sat May 3 15:28:45 2008 -0400

    tiny mq_open optimization
    
    A very small cleanup for mq_open.
    
    We do not have to call set_close_on_exit if we create the file
    descriptor right away with the flag set.  We have a function for this
    now.  The resulting code is smaller and a tiny bit faster.
    
    Signed-off-by: Ulrich Drepper <drepper@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d35c7b0e54a596c5a8134d75999b7f391a9c6550
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Sat May 3 15:10:37 2008 -0400

    unified (weak) sys_pipe implementation
    
    This replaces the duplicated arch-specific versions of "sys_pipe()" with
    one unified implementation.  This removes almost 250 lines of duplicated
    code.
    
    It's marked __weak, so that *if* an architecture wants to override the
    default implementation it can do so by simply having its own replacement
    version, since many architectures use alternate calling conventions for
    the 'pipe()' system call for legacy reasons (ie traditional UNIX
    implementations often return the two file descriptors in registers)
    
    I still haven't changed the cris version even though Linus says the BKL
    isn't needed.  The arch maintainer can easily do it if there are really
    no obstacles.
    
    Signed-off-by: Ulrich Drepper <drepper@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4f95f81a48623982879f4fa80c641933444afd18
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Sat May 3 14:23:14 2008 +0200

    clocksource: allow read access to available/current_clocksource
    
    There is no harm, when users can read the info and we ask often enough
    during debugging for this kind of information.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: John Stultz <johnstul@us.ibm.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 4359a023a8c3b247b348c310bf510b23f3c1ab64
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Fri May 2 12:49:40 2008 +0200

    clocksource: Fix permissions for available_clocksource
    
    File permissions for
    /sys/devices/system/clocksource/clocksource0/available_clocksource
    are 600 which allows write access. But this is in fact a read only
    file. So change permissions to 400.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: John Stultz <johnstul@us.ibm.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 4346f65426cbceb64794b468e4af6f5632d58c5e
Author: Oliver Hartkopp <oliver@hartkopp.net>
Date:   Wed Apr 30 23:04:37 2008 +0200

    hrtimer: remove duplicate helper function
    
    The helper function hrtimer_callback_running() is used in
    kernel/hrtimer.c as well as in the updated net/can/bcm.c which now
    supports hrtimers. Moving the helper function to hrtimer.h removes the
    duplicate definition in the C-files.
    
    Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>
    Cc: David Miller <davem@davemloft.net>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>