Eric Lee / smarc-fsl-linux-kernel

29 Dec, 2011

1 commit

11 Dec, 2011

1 commit

25 Mar, 2011

1 commit

  • 66d857b08   m68k: merge m68k and m68knommu arch directories ... Browse Code »

    There is a lot of common code that could be shared between the m68k
    and m68knommu arch branches. It makes sense to merge the two branches
    into a single directory structure so that we can more easily share
    that common code.

    This is a brute force merge, based on a script from Stephen King
    , which was originally written by Arnd Bergmann
    .

    > The script was inspired by the script Sam Ravnborg used to merge the
    > includes from m68knommu. For those files common to both arches but
    > differing in content, the m68k version of the file is renamed to
    > _mm. and the m68knommu version of the file is moved into the
    > corresponding m68k directory and renamed _no. and a small
    > wrapper file . is used to select between the two version. Files
    > that are common to both but don't differ are removed from the m68knommu
    > tree and files and directories that are unique to the m68knommu tree are
    > moved to the m68k tree. Finally, the arch/m68knommu tree is removed.
    >
    > To select between the the versions of the files, the wrapper uses
    >
    > #ifdef CONFIG_MMU
    > #include _mm.
    > #else
    > #include _no.
    > #endif

    On top of this file merge I have done a simplistic merge of m68k and
    m68knommu Kconfig, which primarily attempts to keep existing options and
    menus in place. Other than a handful of options being moved it produces
    identical .config outputs on m68k and m68knommu targets I tested it on.

    With this in place there is now quite a bit of scope for merge cleanups
    in future patches.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     

15 Aug, 2010

1 commit

28 Feb, 2010

2 commits

23 Apr, 2009

1 commit

03 Dec, 2008

1 commit

11 Sep, 2008

1 commit

07 Jun, 2008

1 commit

19 May, 2008

2 commits

05 Apr, 2008

1 commit

06 Feb, 2008

1 commit

  • 7e02dbf72   mac68k: remove dead MAC_ADBKEYCODES ... Browse Code »

    It seems, that current kernel source code contains no traces of
    MAC_ADBKEYCODES and no reference to keyboard_sends_linux_keycodes any more.

    Remove them from configuration files.

    Signed-off-by: Stanislav Brabec
    Signed-off-by: Geert Uytterhoeven
    Cc: Roman Zippel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stanislav Brabec
     

13 Jun, 2005

2 commits

19 Apr, 2005

2 commits

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