[U-Boot] [PULL] u-boot-pxa / fix

[Marek Vasut]

> Hi Marek,
> 
> Le 27/02/2012 21:53, Marek Vasut a écrit :
> >> Hi Marek,
> >> 
> >> Le 27/02/2012 14:03, Marek Vasut a écrit :
> >>> The following changes since commit 
417c2c787e32784b5de975065a7d1dd5b3cc8ecd:
> >>>     at91: modified NAND flash timing on otc570 board (2012-02-20
> >>>     09:00:13 +0100)
> >>> 
> >>> are available in the git repository at:
> >>>     git://git.denx.de/u-boot-pxa.git fix
> >>> 
> >>> for you to fetch changes up to 2e85d5c10f01b21ac47f9b0dd4a9dcc022ac0be6:
> >>>     PXA: Fix missing get_tbclk() breaking vpac boards (2012-02-27
> >>>     13:59:47 +0100)
> >>> 
> >>> ----------------------------------------------------------------
> >>> 
> >>> Marek Vasut (3):
> >>>         PXA: Remove PXA PCMCIA support
> >>>         PXA: Fix warning in zipitz2
> >>>         PXA: Fix missing get_tbclk() breaking vpac boards
> >>> 
> >>> Simon Glass (1):
> >>>         arm: Remove jornada link script
> >>> 
> >>> Vasily Khoruzhick (2):
> >>>         zipitz2: fix boot issue introduced by PXA low level init rework
> >>>         zipitz2: use pxa_mmc_gen as MMC driver
> >>>    
> >>>    arch/arm/cpu/pxa/timer.c    |    5 ++
> >>>    board/jornada/u-boot.lds    |   58 ---------------------------
> >>>    board/zipitz2/zipitz2.c     |    9 ++++
> >>>    doc/README.PXA_CF           |   56 --------------------------
> >>>    drivers/pcmcia/Makefile     |    1 -
> >>>    drivers/pcmcia/pxa_pcmcia.c |   93
> >>>    -------------------------------------------
> >>>    include/configs/zipitz2.h
> >>>    
> >>>     |   14 +++++-
> >>>    
> >>>    include/pcmcia.h            |    3 +-
> >>>    8 files changed, 26 insertions(+), 213 deletions(-)
> >>>    delete mode 100644 board/jornada/u-boot.lds
> >>>    delete mode 100644 doc/README.PXA_CF
> >>>    delete mode 100644 drivers/pcmcia/pxa_pcmcia.c
> >> 
> >> Is there a reason why this pull request is on a "fix" branch, not
> >> "master"?
> >> 
> >> Amicalement,
> > 
> > Since those are mostly fixes.
> 
> My meaning was, if they are fixes, then why are they not on
> u-boot-pxa/master as they should be?

Because I'm an evil maintainer that is very happy if he can bring in 
inconsistency ! I'll put it into master next time.

Cheers!
M