08 Mar, 2010

2 commits


07 Mar, 2010

3 commits


06 Mar, 2010

5 commits


02 Mar, 2010

2 commits

  • Conflicts:
    arch/arm/plat-omap/Kconfig

    Tony Lindgren
     
  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
    ARM: Eliminate decompressor -Dstatic= PIC hack
    ARM: 5958/1: ARM: U300: fix inverted clk round rate
    ARM: 5956/1: misplaced parentheses
    ARM: 5955/1: ep93xx: move timer defines into core.c and document
    ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
    ARM: 5953/1: ep93xx: fix broken build of clock.c
    ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
    ARM: 5949/1: NUC900 add gpio virtual memory map
    ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
    ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
    ARM: make_coherent(): fix problems with highpte, part 2
    MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
    ARM: 5945/1: ep93xx: include correct irq.h in core.c
    ARM: 5933/1: amba-pl011: support hardware flow control
    ARM: 5930/1: Add PKMAP area description to memory.txt.
    ARM: 5929/1: Add checks to detect overlap of memory regions.
    ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
    ARM: 5927/1: Make delimiters of DMA area globally visibly.
    ARM: 5926/1: Add "Virtual kernel memory..." printout.
    ARM: 5920/1: OMAP4: Enable L2 Cache
    ...

    Fix up trivial conflict in arch/arm/mach-mx25/clock.c

    Linus Torvalds
     

27 Feb, 2010

1 commit

  • This patch makes the ar7 clock code implement the Linux clk API. Drivers
    using the various clocks available in the SoC are updated accordingly.

    Signed-off-by: Florian Fainelli
    Acked-by: Wim Van Sebroeck
    To: linux-mips@linux-mips.org
    Cc: Wim Van Sebroeck
    Cc: netdev@vger.kernel.org
    Cc: David Miller
    Patchwork: http://patchwork.linux-mips.org/patch/881/
    Signed-off-by: Ralf Baechle

    Florian Fainelli
     

22 Feb, 2010

1 commit


16 Feb, 2010

2 commits


13 Feb, 2010

2 commits


26 Jan, 2010

1 commit


20 Jan, 2010

1 commit

  • This patch fixes a build failure[1] caused by the missing include of
    timer.h and thus fixes the build failure.

    Notably the build failure existed since October 2009! [2]

    References:
    [1] http://kisskb.ellerman.id.au/kisskb/buildresult/1983339/
    [2] http://kisskb.ellerman.id.au/kisskb/buildresult/1351737/

    Signed-off-by: Peter Huewe
    Signed-off-by: Wim Van Sebroeck

    Peter Huewe
     

19 Jan, 2010

1 commit


24 Dec, 2009

2 commits


19 Dec, 2009

1 commit


17 Dec, 2009

1 commit

  • The platform has never been fully merged

    Signed-off-by: Ralf Baechle
    Cc: Thomas Koeller
    Cc: David Woodhouse
    Cc: Wim Van Sebroeck
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mtd@lists.infradead.org
    Acked-by: David Woodhouse
    Acked-by: Wim Van Sebroeck

    Ralf Baechle
     

16 Dec, 2009

1 commit


14 Dec, 2009

2 commits

  • This patch renames function names like twl4030_i2c_write_u8,
    twl4030_i2c_read_u8 to twl_i2c_write_u8, twl_i2c_read_u8
    and also common variable in twl-core.c

    Signed-off-by: Rajendra Nayak
    Signed-off-by: Balaji T K
    Signed-off-by: Santosh Shilimkar
    Acked-by: Kevin Hilman
    Signed-off-by: Samuel Ortiz

    Balaji T K
     
  • The upcoming TWL6030 is companion chip for OMAP4 like the current TWL4030
    for OMAP3. The common modules like RTC, Regulator creates opportunity
    to re-use the most of the code from twl4030.

    This patch renames few common drivers twl4030* files to twl* to enable
    the code re-use.

    Signed-off-by: Rajendra Nayak
    Signed-off-by: Balaji T K
    Signed-off-by: Santosh Shilimkar
    Acked-by: Kevin Hilman
    Signed-off-by: Samuel Ortiz

    Santosh Shilimkar
     

13 Dec, 2009

1 commit

  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits)
    powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
    MAINTAINERS: Add PowerPC patterns
    powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
    powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
    powerpc: Make "intspec" pointers in irq_host->xlate() const
    powerpc/8xx: DTLB Miss cleanup
    powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
    powerpc/8xx: Start using dcbX instructions in various copy routines
    powerpc/8xx: Restore _PAGE_WRITETHRU
    powerpc/8xx: Add missing Guarded setting in DTLB Error.
    powerpc/8xx: Fixup DAR from buggy dcbX instructions.
    powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
    powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
    powerpc/8xx: Invalidate non present TLBs
    powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
    pseries/pseries: Add code to online/offline CPUs of a DLPAR node
    powerpc: stop_this_cpu: remove the cpu from the online map.
    powerpc/pseries: Add kernel based CPU DLPAR handling
    sysfs/cpu: Add probe/release files
    powerpc/pseries: Kernel DLPAR Infrastructure
    ...

    Linus Torvalds
     

10 Dec, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
    tree-wide: fix misspelling of "definition" in comments
    reiserfs: fix misspelling of "journaled"
    doc: Fix a typo in slub.txt.
    inotify: remove superfluous return code check
    hdlc: spelling fix in find_pvc() comment
    doc: fix regulator docs cut-and-pasteism
    mtd: Fix comment in Kconfig
    doc: Fix IRQ chip docs
    tree-wide: fix assorted typos all over the place
    drivers/ata/libata-sff.c: comment spelling fixes
    fix typos/grammos in Documentation/edac.txt
    sysctl: add missing comments
    fs/debugfs/inode.c: fix comment typos
    sgivwfb: Make use of ARRAY_SIZE.
    sky2: fix sky2_link_down copy/paste comment error
    tree-wide: fix typos "couter" -> "counter"
    tree-wide: fix typos "offest" -> "offset"
    fix kerneldoc for set_irq_msi()
    spidev: fix double "of of" in comment
    comment typo fix: sybsystem -> subsystem
    ...

    Linus Torvalds
     

09 Dec, 2009

5 commits


08 Dec, 2009

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
    sparc: Set UTS_MACHINE correctly.
    sparc,leon: init_leon srmmu cleanup
    sparc32: Remove early interrupt enable.
    sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structure
    sparc64: Faster early-boot framebuffer console.
    Revert "sparc: Make atomic locks raw"
    sparc: remove unused nfsd #includes
    sparc: Fixup last users of irq_chip->typename
    Added sparc_leon3_snooping_enabled() and converted extern inline to static inline
    No auxio on LEON
    apbuart: Use of_find_node_by_path to find root node.
    sparc: Replace old style lock initializer
    sparc: Make atomic locks raw
    apbuart: Fix build and missing driver unregister.
    apbuart: Kill dependency on deprecated Sparc-only PROM interfaces.
    apbuart: Fix build warning.
    sparc: Support for GRLIB APBUART serial port
    watchdog: Remove BKL from rio watchdog driver
    sparc: Remove BKL from apc
    sparc,leon: Sparc-Leon SMP support

    Linus Torvalds
     
  • Conflicts:

    kernel/irq/chip.c

    Jiri Kosina
     

04 Dec, 2009

3 commits