22 May, 2009

1 commit


14 May, 2009

20 commits


08 Apr, 2009

1 commit


07 Apr, 2009

1 commit

  • * git://git.infradead.org/mtd-2.6: (53 commits)
    [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
    [MTD] [NOR] Fixup for Numonyx M29W128 chips
    [MTD] mtdpart: Make ecc_stats more realistic.
    powerpc/85xx: TQM8548: Update DTS file for multi-chip support
    powerpc: NAND: FSL UPM: document new bindings
    [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
    [MTD] [NAND] FSL-UPM: add multi chip support
    [MTD] [NOR] Add device parent info to physmap_of
    [MTD] [NAND] Add support for NAND on the Socrates board
    [MTD] [NAND] Add support for 4KiB pages.
    [MTD] sysfs support should not depend on CONFIG_PROC_FS
    [MTD] [NAND] Add parent info for CAFÉ controller
    [MTD] support driver model updates
    [MTD] driver model updates (part 2)
    [MTD] driver model updates
    [MTD] [NAND] move gen_nand's probe function to .devinit.text
    [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
    [MTD] fix use after free in register_mtd_blktrans
    [MTD] [MAPS] Drop now unused sharpsl-flash map
    [MTD] ofpart: Check name property to determine partition nodes.
    ...

    Manually fix trivial conflict in drivers/mtd/maps/Makefile

    Linus Torvalds
     

06 Apr, 2009

1 commit

  • * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
    tracing, net: fix net tree and tracing tree merge interaction
    tracing, powerpc: fix powerpc tree and tracing tree interaction
    ring-buffer: do not remove reader page from list on ring buffer free
    function-graph: allow unregistering twice
    trace: make argument 'mem' of trace_seq_putmem() const
    tracing: add missing 'extern' keywords to trace_output.h
    tracing: provide trace_seq_reserve()
    blktrace: print out BLK_TN_MESSAGE properly
    blktrace: extract duplidate code
    blktrace: fix memory leak when freeing struct blk_io_trace
    blktrace: fix blk_probes_ref chaos
    blktrace: make classic output more classic
    blktrace: fix off-by-one bug
    blktrace: fix the original blktrace
    blktrace: fix a race when creating blk_tree_root in debugfs
    blktrace: fix timestamp in binary output
    tracing, Text Edit Lock: cleanup
    tracing: filter fix for TRACE_EVENT_FORMAT events
    ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
    x86: kretprobe-booster interrupt emulation code fix
    ...

    Fix up trivial conflicts in
    arch/parisc/include/asm/ftrace.h
    include/linux/memory.h
    kernel/extable.c
    kernel/module.c

    Linus Torvalds
     

03 Apr, 2009

2 commits

  • Pass the original flags to rwlock arch-code, so that it can re-enable
    interrupts if implemented for that architecture.

    Initially, make __raw_read_lock_flags and __raw_write_lock_flags stubs
    which just do the same thing as non-flags variants.

    Signed-off-by: Petr Tesarik
    Signed-off-by: Robin Holt
    Acked-by: Peter Zijlstra
    Cc:
    Acked-by: Ingo Molnar
    Cc: "Luck, Tony"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robin Holt
     
  • Signed-off-by: Ralf Baechle
    Signed-off-by: Gerd Hoffmann
    Cc: Arnd Bergmann
    Cc: Al Viro
    Cc:
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     

02 Apr, 2009

1 commit


01 Apr, 2009

1 commit

  • The GPIO API is supposed to return 0 or a negative error code,
    but the SSB GPIO functions return the bitmask of the GPIO register.
    Fix this by ignoring the bitmask and always returning 0. The SSB GPIO functions can't fail.

    Signed-off-by: Michael Buesch
    Cc: Ralf Baechle
    Cc: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Buesch
     

31 Mar, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask:
    oprofile: Thou shalt not call __exit functions from __init functions
    cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic
    cpumask: remove cpumask_t from core
    cpumask: convert rcutorture.c
    cpumask: use new cpumask_ functions in core code.
    cpumask: remove references to struct irqaction's mask field.
    cpumask: use mm_cpumask() wrapper: kernel/fork.c
    cpumask: use set_cpu_active in init/main.c
    cpumask: remove node_to_first_cpu
    cpumask: fix seq_bitmap_*() functions.
    cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL

    Linus Torvalds
     

30 Mar, 2009

9 commits


28 Mar, 2009

1 commit


27 Mar, 2009

1 commit

  • …el/git/tip/linux-2.6-tip

    * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
    x86: headers cleanup - setup.h
    emu101k1.h: fix duplicate include of <linux/types.h>
    compiler-gcc4: conditionalize #error on __KERNEL__
    remove __KERNEL_STRICT_NAMES
    make netfilter use strict integer types
    make drm headers use strict integer types
    make MTD headers use strict integer types
    make most exported headers use strict integer types
    make exported headers use strict posix types
    unconditionally include asm/types.h from linux/types.h
    make linux/types.h as assembly safe
    Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
    headers_check fix cleanup: linux/reiserfs_fs.h
    headers_check fix cleanup: linux/nubus.h
    headers_check fix cleanup: linux/coda_psdev.h
    headers_check fix: x86, setup.h
    headers_check fix: x86, prctl.h
    headers_check fix: linux/reinserfs_fs.h
    headers_check fix: linux/socket.h
    headers_check fix: linux/nubus.h
    ...

    Manually fix trivial conflicts in:
    include/linux/netfilter/xt_limit.h
    include/linux/netfilter/xt_statistic.h

    Linus Torvalds