[GIT PULL] pxa: patches for next merge window

Russell King - ARM Linux linux at arm.linux.org.uk
Thu Feb 25 16:29:15 EST 2010


On Thu, Feb 25, 2010 at 08:51:13PM +0000, Russell King - ARM Linux wrote:
> Err, you've rebased your tree since I last pulled it, and this now results
> in the following, and a load of duplicated commits between the two trees.
> 
> This is not nice, please don't rebase stuff which I've already pulled.
> 
> I'm going to think about what to do about this; I can't trivially drop
> your previous work from my tree.

What happened to this commit?

[ARM] pxa/ttc_dkb: remove duplicate macro definition

which follows:

[ARM] pxa/raumfeld: add defconfig
[ARM] pxa/raumfeld: add platform support

in your previous pull request?  I can find these two in your latest with
different commit IDs, but not the pxa/ttc_dkb patch.



More information about the linux-arm-kernel mailing list