Doug / smarc-fsl-linux-kernel

17 Jan, 2012

2 commits

  • 5b3fcfed3   Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm ... Browse Code »

    * 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm:
    ARM: sa11x0: assabet: fix build warning
    ARM: Add arm_memblock_steal() to allocate memory away from the kernel
    ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format
    ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97
    ARM: 7272/1: S3C24XX: Fix build error for missing
    ARM: 7271/1: Fix typo in conversion of ARCH_NR_GPIOS to Kconfig

    Linus Torvalds
     
  • a61c2332f   ARM: sa11x0: assabet: fix build warning ... Browse Code »

    Since a32618d2 (ARM: pgtable: switch to use pgtable-nopud.h), assabet
    warns as follows:

    arch/arm/mach-sa1100/assabet.c: In function 'map_sa1100_gpio_regs':
    arch/arm/mach-sa1100/assabet.c:264: warning: passing argument 1 of 'pmd_offset' from incompatible pointer type

    Fix this by adding the necessary pud_offset() macro.

    Signed-off-by: Russell King

    Russell King
     

14 Jan, 2012

1 commit

  • 21ebd6c68   Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 ... Browse Code »

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)
    rtc: max8925: Add function to work as wakeup source
    mfd: Add pm ops to max8925
    mfd: Convert aat2870 to dev_pm_ops
    mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
    mfd: Introduce missing kfree in 88pm860x probe routine
    mfd: Add S5M series configuration
    mfd: Add s5m series irq driver
    mfd: Add S5M core driver
    mfd: Improve mc13xxx dt binding document
    mfd: Fix stmpe section mismatch
    mfd: Fix stmpe build warning
    mfd: Fix STMPE I2c build failure
    mfd: Constify aat2870-core i2c_device_id table
    gpio: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 610
    mfd: Add support for STMPE SPI interface
    mfd: Separate out STMPE controller and interface specific code
    misc: Remove max8997-muic sysfs attributes
    mfd: Remove unused wm831x_irq_data_to_mask_reg()
    ...

    Fix up trivial conflict in drivers/leds/Kconfig due to addition of
    LEDS_MAX8997 and LEDS_TCA6507 next to each other.

    Linus Torvalds
     

09 Jan, 2012

2 commits

05 Jan, 2012

1 commit

29 Oct, 2011

1 commit

  • 1fdb24e96   Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/… ... Browse Code »

    …git-cur/linux-2.6-arm

    * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
    ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
    ARM: gic, local timers: use the request_percpu_irq() interface
    ARM: gic: consolidate PPI handling
    ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
    ARM: mach-s5p64x0: remove mach/memory.h
    ARM: mach-s3c64xx: remove mach/memory.h
    ARM: plat-mxc: remove mach/memory.h
    ARM: mach-prima2: remove mach/memory.h
    ARM: mach-zynq: remove mach/memory.h
    ARM: mach-bcmring: remove mach/memory.h
    ARM: mach-davinci: remove mach/memory.h
    ARM: mach-pxa: remove mach/memory.h
    ARM: mach-ixp4xx: remove mach/memory.h
    ARM: mach-h720x: remove mach/memory.h
    ARM: mach-vt8500: remove mach/memory.h
    ARM: mach-s5pc100: remove mach/memory.h
    ARM: mach-tegra: remove mach/memory.h
    ARM: plat-tcc: remove mach/memory.h
    ARM: mach-mmp: remove mach/memory.h
    ARM: mach-cns3xxx: remove mach/memory.h
    ...

    Fix up mostly pretty trivial conflicts in:
    - arch/arm/Kconfig
    - arch/arm/include/asm/localtimer.h
    - arch/arm/kernel/Makefile
    - arch/arm/mach-shmobile/board-ap4evb.c
    - arch/arm/mach-u300/core.c
    - arch/arm/mm/dma-mapping.c
    - arch/arm/mm/proc-v7.S
    - arch/arm/plat-omap/Kconfig
    largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
    CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
    addition of NEED_MACH_MEMORY_H next to HAVE_IDE.

    Linus Torvalds
     

17 Oct, 2011

1 commit

  • 0744a3ee3   ARM: platform fixups: remove mdesc argument to fixup function ... Browse Code »

    Get rid of the mdesc pointer in the fixup function call. No one uses
    the mdesc pointer, it shouldn't be modified anyway, and we can't wrap
    it, so let's remove it.

    Platform files found by:

    $ regexp=$(git grep -h '\.fixup.*=' arch/arm |
    sed 's!.*= *\([^,]*\),* *!\1!' | sort -u |
    tr '\n' '|' | sed 's,|$,,;s,|,\\|,g')
    $ git grep $regexp arch/arm

    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Russell King
     

22 Aug, 2011

1 commit

19 Jul, 2011

1 commit

20 Oct, 2010

1 commit

  • 6451d7783   arm: remove machine_desc.io_pg_offst and .phys_io ... Browse Code »

    Since we're now using addruart to establish the debug mapping, we can
    remove the io_pg_offst and phys_io members of struct machine_desc.

    The various declarations were removed using the following script:

    grep -rl MACHINE_START arch/arm | xargs \
    sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'

    [ Initial patch was from Jeremy Kerr, example script from Russell King ]

    Signed-off-by: Nicolas Pitre
    Acked-by: Eric Miao

    Nicolas Pitre
     

07 Dec, 2009

1 commit

07 Aug, 2008

2 commits

01 Jul, 2006

1 commit

22 Mar, 2006

1 commit

14 Jan, 2006

1 commit

22 Nov, 2005

1 commit

28 Oct, 2005

1 commit

18 Aug, 2005

1 commit

04 Jul, 2005

1 commit

17 Apr, 2005

1 commit

  • 1da177e4c   Linux-2.6.12-rc2 ... Browse Code »

    Initial git repository build. I'm not bothering with the full history,
    even though we have it. We can create a separate "historical" git
    archive of that later if we want to, and in the meantime it's about
    3.2GB when imported into git - space that would just make the early
    git days unnecessarily complicated, when we don't have a lot of good
    infrastructure for it.

    Let it rip!

    Linus Torvalds