[Pull request] OMAP mainline flavour

Amit Kucheria amit.kucheria at canonical.com
Mon May 24 16:43:46 UTC 2010

Hi Leann,

Please pull from my tree to enable an omap-mainline flavour in the _master_
branch. I'd like us to only apply mainline (or obviously on their way to
mainline) patches related to OMAP to the master branch.

The patch by Koen should go away once we rebase to 2.6.35-rc. My patch to
remove calls to usb_nop_xceiv_register should go away once upstream figures
out the right way to fix the problem.

I've not run 'updateconfigs' as part of the patch to make it easy to keep
rebasing during development. Boot tested on a beagleboard C4.


The following changes since commit 0a92961255bbb2d344af66d313f4a2c696d50b5e:
  Kees Cook (1):
        UBUNTU: SAUCE: fs: block hardlinks to non-accessible sources

are available in the git repository at:

  git://kernel.ubuntu.com/amitk/maverick.git master

Amit Kucheria (2):
      UBUNTU: SAUCE: omap: remove calls to usb_nop_xceiv_register from board files
      UBUNTU: [Config] Add support for OMAP-mainline flavour

Koen Kooi (1):
      UBUNTU: SAUCE: board-omap3-beagle: add DSS2 support

 arch/arm/mach-omap2/board-4430sdp.c                |   10 +-
 arch/arm/mach-omap2/board-omap3beagle.c            |  101 +-
 arch/arm/mach-omap2/board-omap3evm.c               |   11 +-
 debian.master/abi/2.6.34-3.10/armel/omap.ignore    |    1 +
 .../abi/2.6.34-3.10/armel/omap.ignore.modules      |    1 +
 debian.master/config/armel/config.flavour.omap     | 3224 ++++++++++++++++++++
 debian.master/control.d/vars.omap                  |    8 +
 debian.master/rules.d/armel.mk                     |    2 +-
 8 files changed, 3326 insertions(+), 32 deletions(-)
 create mode 100644 debian.master/abi/2.6.34-3.10/armel/omap.ignore
 create mode 100644 debian.master/abi/2.6.34-3.10/armel/omap.ignore.modules
 create mode 100644 debian.master/config/armel/config.flavour.omap
 create mode 100644 debian.master/control.d/vars.omap

Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com

More information about the kernel-team mailing list