[GIT,PULL,for,3.5] pull request of board-specific branch in arch-pxa

Submitted by Haojian Zhuang on May 14, 2012, 1:42 a.m.

Details

Message ID CAN1soZyM-YQ9EX66EY_fTwPncokra9NpB6QEZ2ExCGizKk9MAA@mail.gmail.com
State New
Headers show

Pull-request

git://github.com/hzhuang1/linux.git board-specific

Commit Message

Haojian Zhuang May 14, 2012, 1:42 a.m.
Hi Arnd & Olof,

Please help to merge board-specific branch in arch-pxa git tree.

The following changes since commit 36be50515fe2aef61533b516fa2576a2c7fe7664:

  Linux 3.4-rc7 (2012-05-12 18:37:47 -0700)

are available in the git repository at:
  git://github.com/hzhuang1/linux.git board-specific

Axel Lin (1):
      ARM: pxa: Use REGULATOR_SUPPLY macro

Paul Parsons (1):
      ARM: pxa: hx4700: Add Synaptics NavPoint touchpad

 arch/arm/mach-pxa/balloon3.c                |    4 +--
 arch/arm/mach-pxa/cm-x300.c                 |    4 +--
 arch/arm/mach-pxa/em-x270.c                 |    5 +---
 arch/arm/mach-pxa/hx4700.c                  |   37 +++++++++++++++++++-------
 arch/arm/mach-pxa/include/mach/mfp-pxa27x.h |    1 +
 arch/arm/mach-pxa/magician.c                |    8 +----
 arch/arm/mach-pxa/mioa701.c                 |    4 +--
 arch/arm/mach-pxa/palm27x.c                 |    4 +--
 arch/arm/mach-pxa/spitz.c                   |    4 +--
 arch/arm/mach-pxa/stargate2.c               |    5 +---
 arch/arm/mach-pxa/vpac270.c                 |    4 +--
 arch/arm/mach-pxa/z2.c                      |    4 +--
 12 files changed, 39 insertions(+), 45 deletions(-)


Regards
Haojian

Comments

Olof Johansson May 19, 2012, 6:47 a.m.
Hi Haojian,

On Sun, May 13, 2012 at 6:42 PM, Haojian Zhuang
<haojian.zhuang@gmail.com> wrote:
> Hi Arnd & Olof,
>
> Please help to merge board-specific branch in arch-pxa git tree.
>
> The following changes since commit 36be50515fe2aef61533b516fa2576a2c7fe7664:
>
>  Linux 3.4-rc7 (2012-05-12 18:37:47 -0700)
>
> are available in the git repository at:
>  git://github.com/hzhuang1/linux.git board-specific

Hmm. We already pulled a branch with that name before, but it doesn't
seem to contain the same contents as this one. That's OK, but it would
have been fine to just apply these two more patches on top of the
previous branch, and ask us to pull it again (sending the diffstat for
the delta between previous pull and now).

Or create a new branch with a different name for independent patches.
But in this case, a re-pull request would have been fine.

Anyway, I've pulled this in to next/boards (and pxa/boards2) now. Thanks.


-Olof